Merge remote-tracking branch 'input/next'

diff --cc drivers/base/devres.c
Simple merge

diff --cc drivers/input/misc/Kconfig
Simple merge

diff --cc drivers/input/misc/Makefile
Simple merge

diff --cc drivers/input/serio/Kconfig
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

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

diff --cc include/uapi/linux/input.h
Simple merge