Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 14 Apr 2010 06:21:38 +0000 (23:21 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 14 Apr 2010 06:21:38 +0000 (23:21 -0700)

Trivial merge