Merge commit 'v3.5-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 4 Jul 2012 20:13:55 +0000 (13:13 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 4 Jul 2012 20:13:55 +0000 (13:13 -0700)
1  2 
drivers/input/tablet/wacom_sys.c

Simple merge