Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 27 Oct 2011 04:46:20 +0000 (21:46 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 27 Oct 2011 04:46:20 +0000 (21:46 -0700)
commit6ad390a25a9d1d8606b9b826878f0a30639dc2b3
tree05aff14f02776bc0d59a1f777cb92df6f4456ba9
parentd6069dae4700cf5290a75002c46b9be8ea7eef3c
parent3f48e7354358519e5b93f7f755ec270b3f8eafa0
Merge branch 'next' into for-linus
drivers/input/keyboard/adp5588-keys.c
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/wacom_w8001.c