Merge remote-tracking branch 'input/next'

diff --cc arch/arm/boot/dts/omap3-n900.dts
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-goni.c
Simple merge

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

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

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

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