Merge branch 'usb' into ohci
authorroot <root@localhost.localdomain>
Fri, 25 Jul 2008 09:55:58 +0000 (15:25 +0530)
committerroot <root@localhost.localdomain>
Fri, 25 Jul 2008 09:55:58 +0000 (15:25 +0530)

Trivial merge