Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for...
authorDmitry Torokhov <dtor@insightbb.com>
Sat, 5 Aug 2006 02:50:27 +0000 (22:50 -0400)
committerDmitry Torokhov <dtor@insightbb.com>
Sat, 5 Aug 2006 02:50:27 +0000 (22:50 -0400)

Trivial merge