Merge 3.11-rc3 into char-misc-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 18:50:17 +0000 (11:50 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 18:50:17 +0000 (11:50 -0700)
commit9c5891bd4342349a200676d33f742dd1b864822c
treeb14c1698f2d8ce5276e1befd562f6398a46b48b9
parentecda040ff3724f021a96491ecee88d48e968c153
parent5ae90d8e467e625e447000cb4335c4db973b1095
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>
drivers/hv/hv_balloon.c
drivers/misc/atmel-ssc.c
drivers/misc/mei/init.c