Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Mon, 14 Nov 2005 04:28:58 +0000 (20:28 -0800)
committerSteve French <sfrench@us.ibm.com>
Mon, 14 Nov 2005 04:28:58 +0000 (20:28 -0800)

Trivial merge