From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 26 Mar 2013 23:09:30 +0000 (-0700)
Subject: Merge branch 'char-misc-linus' into char-misc-next
X-Git-Tag: v3.10-rc1~194^2~62
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8c876be81a1f2f0ab33ffb2b00871e65c7a658b3;p=~emulex%2Finfiniband.git

Merge branch 'char-misc-linus' into char-misc-next

This picks up the MEI fixes that we need in this branch now.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

8c876be81a1f2f0ab33ffb2b00871e65c7a658b3