Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Tue, 6 Sep 2005 22:47:31 +0000 (15:47 -0700)
committerSteve French <sfrench@us.ibm.com>
Tue, 6 Sep 2005 22:47:31 +0000 (15:47 -0700)

Trivial merge