Merge branch 'cbus' of git://gitorious.org/usb/usb into cbus
authorTony Lindgren <tony@atomide.com>
Fri, 23 Apr 2010 23:37:18 +0000 (16:37 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 23 Apr 2010 23:37:18 +0000 (16:37 -0700)

Trivial merge