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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/misc/mei/bus-fixup.c
Simple merge

diff --cc drivers/nfc/mei_phy.c
Simple merge

diff --cc include/linux/hyperv.h
Simple merge