Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.

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

diff --cc drivers/input/keyboard/pxa27x_keypad.c
Simple merge

diff --cc drivers/input/tablet/wacom_sys.c
Simple merge

diff --cc drivers/input/tablet/wacom_wac.c
Simple merge