Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorGreg KH <greg@press.(none)>
Thu, 30 Jun 2005 05:54:31 +0000 (22:54 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 30 Jun 2005 05:54:31 +0000 (22:54 -0700)

Trivial merge