Merge 3.8-rc4 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jan 2013 17:31:04 +0000 (09:31 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jan 2013 17:31:04 +0000 (09:31 -0800)
This brings in all of the mei and other fixes that are needed to continue
development in this branch.

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

diff --cc MAINTAINERS
Simple merge
Simple merge