Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 11 Oct 2014 18:41:19 +0000 (11:41 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 11 Oct 2014 18:41:19 +0000 (11:41 -0700)
Prepare second round of input updates for 3.18.


Trivial merge