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

Trivial merge