Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Wed, 24 Aug 2005 21:37:23 +0000 (14:37 -0700)
committerSteve French <sfrench@us.ibm.com>
Wed, 24 Aug 2005 21:37:23 +0000 (14:37 -0700)

Trivial merge