Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Thu, 10 Nov 2005 23:34:57 +0000 (15:34 -0800)
committerSteve French <sfrench@us.ibm.com>
Thu, 10 Nov 2005 23:34:57 +0000 (15:34 -0800)

Trivial merge