Merge 'for-linus' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 21 Jun 2005 21:49:35 +0000 (14:49 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 21 Jun 2005 21:49:35 +0000 (14:49 -0700)

Trivial merge