Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Aug 2006 01:08:44 +0000 (18:08 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Aug 2006 01:08:44 +0000 (18:08 -0700)

Trivial merge