Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor@insightbb.com>
Tue, 19 Sep 2006 05:56:44 +0000 (01:56 -0400)
committerDmitry Torokhov <dtor@insightbb.com>
Tue, 19 Sep 2006 05:56:44 +0000 (01:56 -0400)

Trivial merge