Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah...
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 30 Nov 2010 23:38:41 +0000 (15:38 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 30 Nov 2010 23:38:41 +0000 (15:38 -0800)

Trivial merge