Merge branch 'master' of /home/greg/linux/git/torvalds-2.6/
authorGreg Kroah-Hartman <gregkh@suse.de>
Sun, 6 Aug 2006 22:44:39 +0000 (15:44 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 6 Aug 2006 22:44:39 +0000 (15:44 -0700)

Trivial merge