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

diff --cc Documentation/ioctl/ioctl-number.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/misc/mei/mei_dev.h
Simple merge

diff --cc drivers/spmi/spmi-pmic-arb.c
Simple merge

diff --cc drivers/vme/vme_bridge.h
Simple merge

diff --cc include/linux/mod_devicetable.h
Simple merge

diff --cc scripts/mod/devicetable-offsets.c
Simple merge

diff --cc scripts/mod/file2alias.c
Simple merge