tree f8c76e8d306d59862f28dfc1b3bab1e3bb171a8f
parent 62f548d0c2d2418e39b8e4b7ec39b5ca2ef4380d
parent 46146e7d4b383d5b34014d072553498c7cd52821
author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1373697265 -0700
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1373697265 -0700

Merge branch 'next' into for-linus

Bring in second round of updates for 3.11.