Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Fri, 10 Feb 2006 16:53:29 +0000 (16:53 +0000)
committerSteve French <sfrench@us.ibm.com>
Fri, 10 Feb 2006 16:53:29 +0000 (16:53 +0000)
Signed-off-by: Steve French <sfrench@us.ibm.com>

Trivial merge