Merge 4.0-rc3 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Mar 2015 07:44:23 +0000 (08:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Mar 2015 07:44:23 +0000 (08:44 +0100)
commite94f16a4fde646b3f155788fe37339b61264b0a9
tree28f1cf8b1980b6b25c1c58e3e157610a1b851996
parentd2b5851d8583e690eeb5ac8dfff5da92e1f1468f
parent9eccca0843205f87c00404b663188b88eb248051
Merge 4.0-rc3 into char-misc-next

We want the mei fixes in here as well.

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