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)
commit0b6c404a07e3240b95aa5682fb8fd57c41609d7a
treec4d410b0ec7044922b73c39ecfb3fbb620c29282
parent609455f481772c5a875b88e860a2ee0e2f25ebf0
parent55d512e245bc7699a8800e23df1a24195dd08217
Merge tag 'v3.6-rc5' into for-linus

Sync with mainline so that I can revert an input patch that came in through
another subsystem tree.