Greg Kroah-Hartman 9c5891bd43 Merge 3.11-rc3 into char-misc-next.
This resolves a merge issue with:
	drivers/misc/mei/init.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-29 11:50:17 -07:00
..
2013-07-29 11:50:17 -07:00
2013-06-28 13:36:22 +02:00
2013-07-26 11:38:13 -07:00