Merge branch 'for-greg' of git://gitorious.org/usb/usb into work
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 30 Nov 2010 23:52:04 +0000 (15:52 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 30 Nov 2010 23:52:04 +0000 (15:52 -0800)

Trivial merge