Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 21 Apr 2015 18:12:42 +0000 (11:12 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 21 Apr 2015 18:12:42 +0000 (11:12 -0700)
Prepare second round of updates for 4.1 merge window.


Trivial merge