Merge remote-tracking branch 'char-misc/char-misc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:55:27 +0000 (14:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:55:27 +0000 (14:55 +1100)
1  2 
Documentation/ioctl/ioctl-number.txt
MAINTAINERS
drivers/Kconfig
drivers/Makefile
drivers/misc/mei/mei_dev.h
drivers/spmi/spmi-pmic-arb.c
drivers/vme/vme_bridge.h
include/linux/mod_devicetable.h
scripts/mod/devicetable-offsets.c
scripts/mod/file2alias.c

Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge