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)
commit1b79dff672ca09a5461cc1d46ad81c62137841c5
tree772a4224c78aa20862511ae5f7272f9311e4811c
parent83050a4e21979fe1821916fce2fca36255569ed3
parent18558cae0272f8fd9647e69d3fec1565a7949865
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>
MAINTAINERS
drivers/misc/mei/main.c
drivers/watchdog/Kconfig
fs/compat_ioctl.c