Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Thu, 27 Oct 2005 19:53:03 +0000 (12:53 -0700)
committerSteve French <sfrench@us.ibm.com>
Thu, 27 Oct 2005 19:53:03 +0000 (12:53 -0700)

Trivial merge