Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Wed, 16 Nov 2005 00:49:04 +0000 (16:49 -0800)
committerSteve French <sfrench@us.ibm.com>
Wed, 16 Nov 2005 00:49:04 +0000 (16:49 -0800)

Trivial merge