Merge tag 'v3.6-rc5' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 19 Sep 2012 17:21:21 +0000 (10:21 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 19 Sep 2012 17:21:21 +0000 (10:21 -0700)
Sync with mainline so that I can revert an input patch that came in through
another subsystem tree.


Trivial merge