Merge 4.9-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Nov 2016 15:39:47 +0000 (16:39 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Nov 2016 15:39:47 +0000 (16:39 +0100)
We want those fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/misc/mei/bus-fixup.c
drivers/nfc/mei_phy.c
include/linux/hyperv.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge