Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor_core@ameritech.net>
Wed, 1 Jun 2005 07:37:23 +0000 (02:37 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Wed, 1 Jun 2005 07:37:23 +0000 (02:37 -0500)

Trivial merge