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)
commit6596afe3f3b17b44c5fcc1a8c1102e0fe28a17eb
treeee42b5053ffd3df4f6d9c2fe461c2b3cc015df1c
parent78a61ab79ae6bd75593b63fbaf5299c96bac0ea4
parent7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619
Merge 3.8-rc4 into char-misc-next

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>
MAINTAINERS
drivers/misc/mei/amthif.c