Merge tag 'v3.15-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 14 May 2014 23:49:19 +0000 (16:49 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 14 May 2014 23:49:19 +0000 (16:49 -0700)
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.


Trivial merge