Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Tue, 7 Mar 2006 21:47:30 +0000 (21:47 +0000)
committerSteve French <sfrench@us.ibm.com>
Tue, 7 Mar 2006 21:47:30 +0000 (21:47 +0000)
Signed-off-by: Steve French <sfrench@us.ibm.com>

Trivial merge