Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Aug 2006 05:44:55 +0000 (22:44 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Aug 2006 05:44:55 +0000 (22:44 -0700)

Trivial merge