Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor@insightbb.com>
Sat, 10 Feb 2007 06:26:32 +0000 (01:26 -0500)
committerDmitry Torokhov <dtor@insightbb.com>
Sat, 10 Feb 2007 06:26:32 +0000 (01:26 -0500)

Trivial merge