Merge branch 'for-next' of github.com:rydberg/linux into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 9 Mar 2012 18:56:35 +0000 (10:56 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 9 Mar 2012 18:56:35 +0000 (10:56 -0800)

Trivial merge