Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 2 Jul 2013 16:01:31 +0000 (09:01 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 2 Jul 2013 16:01:31 +0000 (09:01 -0700)
Prepare first set of updates for 3.11 merge window.

1  2 
arch/arm/mach-davinci/board-da850-evm.c
drivers/input/keyboard/Kconfig
drivers/input/keyboard/samsung-keypad.c
drivers/input/serio/Kconfig
drivers/input/touchscreen/cyttsp_core.c
drivers/input/touchscreen/cyttsp_core.h

Simple merge
Simple merge