Merge ../torvalds-2.6/
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 5 Aug 2006 17:48:52 +0000 (10:48 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 5 Aug 2006 17:48:52 +0000 (10:48 -0700)

Trivial merge