Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 15:48:56 +0000 (08:48 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 15:48:56 +0000 (08:48 -0700)

Trivial merge