Merge branch 'char-misc-linus' into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Feb 2014 14:36:08 +0000 (06:36 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Feb 2014 14:36:08 +0000 (06:36 -0800)
commit0a191749ce19112f8f20675232b951dccd4ae00e
treeb81540374236beb22d50daaa856910257c0e6e2d
parentc765a6dfad10b857e9681d7c4dec375ebe78db8a
parentaccb884b32e82f943340688c9cd30290531e73e0
Merge branch 'char-misc-linus' into char-misc-next

We want the mei change here to allow future mei patches to apply
properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/client.c