Merge branch 'next' into for-linus

Prepare first set of updates for 3.11 merge window.

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

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

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

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

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

diff --cc drivers/input/touchscreen/cyttsp_core.h
Simple merge