Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 16 Dec 2014 04:32:42 +0000 (20:32 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 16 Dec 2014 04:32:42 +0000 (20:32 -0800)
commitf20c86cd75f1c8c728dafd0218645ff3c5e8545d
treeb9100463df79eeafbef87a0bbbaaba4740313120
parenta1f9a4072655843fc03186acbad65990cc05dd2d
parent1d6a01365fd63fbf7c2709a183e2936728c8efad
Merge branch 'next' into for-linus

Prepare input updates for 3.19.
drivers/input/joystick/xpad.c
drivers/input/misc/ims-pcu.c
drivers/input/misc/max77693-haptic.c
drivers/input/serio/altera_ps2.c
drivers/input/serio/i8042-x86ia64io.h