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)
1  2 
drivers/input/joystick/xpad.c
drivers/input/keyboard/Kconfig
drivers/input/mouse/synaptics.c
drivers/input/tablet/wacom_wac.c

Simple merge
Simple merge
Simple merge
Simple merge