Merge 4.5-rc4 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/main.c
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge

diff --cc fs/compat_ioctl.c
Simple merge