Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 Jan 2014 16:10:44 +0000 (08:10 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 Jan 2014 16:10:44 +0000 (08:10 -0800)
commit55df811f2066fcaec2548248f0a1a6a0c12dc6b8
tree0850f490489e5b941692f3fe36dff5d2c1c35c3c
parent8e2f2325b73f3e5e46ecffd291556f33b8e3f8c9
parent497ab1f290a26fa9414c5c316515f1e2ddba0803
Merge branch 'next' into for-linus

First round of input updates for 3.14.
drivers/input/input.c
drivers/input/joystick/xpad.c
drivers/input/touchscreen/zforce_ts.c