Merge remote-tracking branch 'char-misc/char-misc-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 11 Feb 2016 03:13:28 +0000 (14:13 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 11 Feb 2016 03:13:28 +0000 (14:13 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 03:13:28 +0000 (14:13 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 03:13:28 +0000 (14:13 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/misc/Kconfig
Simple merge
diff --cc drivers/misc/mei/main.c
Simple merge
diff --cc drivers/watchdog/Kconfig
Simple merge
diff --cc drivers/watchdog/Makefile
Simple merge
diff --cc fs/compat_ioctl.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 03:13:28 +0000 (14:13 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 03:13:28 +0000 (14:13 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/mei/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
fs/compat_ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history