Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Aug 2010 01:35:17 +0000 (18:35 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Aug 2010 01:35:17 +0000 (18:35 -0700)
commitd01d0756f75e7a5b4b43764ad45b83c4340f11d6
tree90db2ff7ccb35a8fdcf98366e6404afe1f845bc4
parentb326b853dca2f410b254198ee89abad71a2f4668
parent0d87c7228a49e8342d60dd552892e470e0b291fa
Merge branch 'next' into for-linus
drivers/input/joystick/xpad.c
drivers/input/keyboard/Kconfig
drivers/input/mouse/synaptics.c
drivers/input/tablet/wacom_wac.c