Merge branch 'next' into for-linus

Documentation/devicetree/bindings/input/gpio-keys.txt

Documentation/devicetree/bindings/input/stmpe-keypad.txt

drivers/input/evdev.c

drivers/input/input.c

drivers/input/keyboard/Kconfig

drivers/input/keyboard/gpio_keys.c

drivers/input/keyboard/stmpe-keypad.c

drivers/input/mouse/alps.c

drivers/input/mouse/trackpoint.c

drivers/input/mouse/trackpoint.h

drivers/input/touchscreen/edt-ft5x06.c

drivers/mfd/stmpe.c

drivers/mfd/stmpe.h

include/linux/mfd/stmpe.h