Greg Kroah-Hartman 7da59d2fe3 Merge v3.6-rc3 into 'char-misc-next'
This resolves a conflict in:
	drivers/misc/mei/interrupt.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-27 09:09:07 -07:00
..
2012-06-18 16:41:06 -07:00
2011-08-25 16:25:33 -07:00
2011-08-25 16:25:33 -07:00
2011-08-25 16:25:33 -07:00
2011-08-25 16:25:33 -07:00