Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Wed, 7 Jun 2006 02:40:03 +0000 (02:40 +0000)
committerSteve French <sfrench@us.ibm.com>
Wed, 7 Jun 2006 02:40:03 +0000 (02:40 +0000)

Trivial merge