Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 1 Apr 2008 04:22:26 +0000 (00:22 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 1 Apr 2008 04:22:26 +0000 (00:22 -0400)

Trivial merge