Merge branch 'next' into for-linus

First round of input updates for 3.14.

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

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

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