Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Aug 2010 15:41:58 +0000 (08:41 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Aug 2010 15:41:58 +0000 (08:41 -0700)
commit5fc0d36c00e6a2d0a9f2a0a815cff5b9a13b080d
tree819d3f27a826f29210398615f4918a4cd9154836
parentd01d0756f75e7a5b4b43764ad45b83c4340f11d6
parent6ac8a99b906b01eaceef0057dbee4a225a32c423
Merge branch 'next' into for-linus
drivers/input/joystick/xpad.c
drivers/input/mouse/synaptics.c
drivers/input/tablet/wacom_wac.c