From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jun 2008 00:29:32 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.26-rc6~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=631025b4d87d5a9d7e04a1ed652d247191e223d4;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: don't use reset-resume if drivers don't support it
  USB: isp1760: Assign resource fields before adding hcd
  isight_firmware: Avoid crash on loading invalid firmware
  USB: fix build bug in USB_ISIGHTFW
---

631025b4d87d5a9d7e04a1ed652d247191e223d4