Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorChristoph Hellwig <hch@hera.kernel.org>
Fri, 27 May 2005 08:16:24 +0000 (01:16 -0700)
committerChristoph Hellwig <hch@melbourne.sgi.com>
Fri, 27 May 2005 08:16:24 +0000 (01:16 -0700)

Trivial merge