Merge branch 'next' into for-linus

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

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

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

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