Merge ../torvalds-2.6/
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2006 20:59:59 +0000 (12:59 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2006 20:59:59 +0000 (12:59 -0800)

Trivial merge