Merge branch 'next' into for-linus

...ee/bindings/input/touchscreen/raspberrypi,firmware-ts.txt

Documentation/devicetree/bindings/serio/olpc,ap-sp.txt

drivers/clk/mmp/clk-of-mmp2.c

drivers/input/keyboard/nomadik-ske-keypad.c

drivers/input/misc/drv2667.c

drivers/input/misc/rotary_encoder.c

drivers/input/serio/Kconfig

drivers/input/serio/olpc_apsp.c

drivers/input/touchscreen/Kconfig

drivers/input/touchscreen/Makefile

drivers/input/touchscreen/ad7879.c

drivers/input/touchscreen/atmel_mxt_ts.c

drivers/input/touchscreen/ektf2127.c

drivers/input/touchscreen/gunze.c

drivers/input/touchscreen/inexio.c

drivers/input/touchscreen/mtouch.c

drivers/input/touchscreen/raspberrypi-ts.c

include/dt-bindings/clock/marvell,mmp2.h

include/linux/platform_data/ad7879.h