Merge branch 'next' into for-linus

Prepare input updates for 3.19.

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

diff --cc drivers/input/misc/ims-pcu.c
Simple merge

diff --cc drivers/input/misc/max77693-haptic.c
Simple merge

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

diff --cc drivers/input/serio/i8042-x86ia64io.h
Simple merge