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)
commitb7d91c915290ab0bfbab84a0fb9c9eae57816982
tree75c1d0e53e297f6bd1eae2c04ed463a8f603b5cd
parentf2ed287bcc9073d8edbf6561c389b282163edc78
parenta25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6
Merge 4.9-rc5 into char-misc-next

We want those fixes in here as well.

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