Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Fri, 11 Nov 2005 01:31:49 +0000 (17:31 -0800)
committerSteve French <sfrench@us.ibm.com>
Fri, 11 Nov 2005 01:31:49 +0000 (17:31 -0800)

Trivial merge