Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Wed, 18 Jan 2006 03:49:59 +0000 (19:49 -0800)
committerSteve French <sfrench@us.ibm.com>
Wed, 18 Jan 2006 03:49:59 +0000 (19:49 -0800)
Signed-off-by: Steve French <sfrench@us.ibm.com>

Trivial merge