Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 13 Jul 2013 06:34:25 +0000 (23:34 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 13 Jul 2013 06:34:25 +0000 (23:34 -0700)
Bring in second round of updates for 3.11.


Trivial merge