Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Mon, 5 Dec 2005 19:15:30 +0000 (11:15 -0800)
committerSteve French <sfrench@us.ibm.com>
Mon, 5 Dec 2005 19:15:30 +0000 (11:15 -0800)
Signed-off-by: Steve French <sfrench@us.ibm.com>

Trivial merge