Merge remote-tracking branch 'input/next'

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-mmp/teton_bga.c
Simple merge

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

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

diff --cc drivers/input/keyboard/omap4-keypad.c
Simple merge

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

diff --cc drivers/input/touchscreen/egalax_ts.c
Simple merge

diff --cc drivers/tty/sysrq.c
Simple merge