Merge branch 'for-next' of git://github.com/rydberg/linux into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 28 Jun 2013 06:00:25 +0000 (23:00 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 28 Jun 2013 06:00:25 +0000 (23:00 -0700)
commit31881d74b6dd1a6c530cff61248def4f2da38bee
treebe62420cf39192074e13b25553d172b9d5e58a33
parent8855f30cd2b68012571932c7b01290c20be4508c
parent257867dc8d893690c175c1f717f91c3b6d44a63d
Merge branch 'for-next' of git://github.com/rydberg/linux into next

Pull in changes from Henrik: "a trivial MT documentation fix".
arch/arm/mach-mmp/aspenite.c
arch/arm/mach-mmp/teton_bga.c
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/keyboard/omap4-keypad.c
drivers/input/misc/Kconfig
drivers/input/touchscreen/egalax_ts.c
drivers/tty/sysrq.c