Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor@insightbb.com>
Sun, 5 Nov 2006 03:42:39 +0000 (22:42 -0500)
committerDmitry Torokhov <dtor@insightbb.com>
Sun, 5 Nov 2006 03:42:39 +0000 (22:42 -0500)

Trivial merge