Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <[email protected]>
Wed, 1 Feb 2006 20:16:53 +0000 (12:16 -0800)
committerSteve French <[email protected]>
Wed, 1 Feb 2006 20:16:53 +0000 (12:16 -0800)
Signed-off-by: Steve French <[email protected]>

Trivial merge