Merge branch 'next' into for-linus

...tation/devicetree/bindings/input/cypress,tm2-touchkey.txt

Documentation/devicetree/bindings/input/mpr121-touchkey.txt

Documentation/devicetree/bindings/input/pwm-beeper.txt

...ntation/devicetree/bindings/input/touchscreen/zet6223.txt

Documentation/devicetree/bindings/vendor-prefixes.txt

drivers/input/Kconfig

drivers/input/input.c

drivers/input/joydev.c

drivers/input/joystick/maplecontrol.c

drivers/input/joystick/xpad.c

drivers/input/keyboard/Kconfig

drivers/input/keyboard/Makefile

drivers/input/keyboard/adc-keys.c

drivers/input/keyboard/adp5520-keys.c

drivers/input/keyboard/bcm-keypad.c

drivers/input/keyboard/bf54x-keys.c

drivers/input/keyboard/cap11xx.c

drivers/input/keyboard/cros_ec_keyb.c

drivers/input/keyboard/davinci_keyscan.c

drivers/input/keyboard/gpio_keys.c