Merge branch 'char-misc-linus' into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 23:09:30 +0000 (16:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 23:09:30 +0000 (16:09 -0700)
commit8c876be81a1f2f0ab33ffb2b00871e65c7a658b3
tree60426265759ab14b00c94a791520f140062bb57c
parent02dbd0ff5448d4da0c6e9d59c897f3e31a16d51a
parent347e0899b1c75d907f01ac883ca38d37fe9bfa42
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>
drivers/misc/mei/hw-me.c
drivers/misc/mei/init.c
drivers/misc/mei/mei_dev.h