Merge commit 'v3.4-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)
commit57b8628bb0ac4e47c806e45c5bbd89282e93869b
treeee9289f0898054474b7e5054abdb3ffb78666436
parent486c8aba39e5f194519cd5c0e85e5d1de8b74b03
parent66f75a5d028beaf67c931435fdc3e7823125730c
Merge commit 'v3.4-rc4' into next
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/Kconfig