Merge 4.5-rc4 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 14 Feb 2016 22:25:59 +0000 (14:25 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 14 Feb 2016 22:25:59 +0000 (14:25 -0800)
We want those fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/misc/mei/main.c
drivers/watchdog/Kconfig
fs/compat_ioctl.c

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