Merge 4.12-rc5 into char-misc-next

We want the char/misc driver fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/hisilicon/hi6220.dtsi
Simple merge

diff --cc drivers/firmware/google/vpd.c
Simple merge

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

diff --cc drivers/platform/goldfish/goldfish_pipe.c
Simple merge