Merge tag 'v3.11' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 18 Sep 2013 14:58:33 +0000 (07:58 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 18 Sep 2013 14:58:33 +0000 (07:58 -0700)
Merge with mainline to bring in sync changes to cyttsp4 driver.


Trivial merge