Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 4 Jul 2015 06:56:31 +0000 (23:56 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 4 Jul 2015 06:56:31 +0000 (23:56 -0700)
Prepare second round of input updates for 4.2 merge window.


Trivial merge