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

Trivial merge