Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor_core@ameritech.net>
Mon, 11 Jul 2005 05:58:04 +0000 (00:58 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Mon, 11 Jul 2005 05:58:04 +0000 (00:58 -0500)

Trivial merge