Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Mon, 31 Oct 2005 16:36:11 +0000 (08:36 -0800)
committerSteve French <sfrench@us.ibm.com>
Mon, 31 Oct 2005 16:36:11 +0000 (08:36 -0800)

Trivial merge