Merge HEAD from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorDmitry Torokhov <dtor_core@ameritech.net>
Sun, 4 Sep 2005 06:35:56 +0000 (01:35 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Sun, 4 Sep 2005 06:35:56 +0000 (01:35 -0500)

Trivial merge