Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Sun, 25 Jun 2006 15:57:32 +0000 (15:57 +0000)
committerSteve French <sfrench@us.ibm.com>
Sun, 25 Jun 2006 15:57:32 +0000 (15:57 +0000)

Trivial merge