Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 21 Jul 2008 04:55:14 +0000 (00:55 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 21 Jul 2008 04:55:14 +0000 (00:55 -0400)

Trivial merge