commit 7bddaaca472a08bb8a80b653855a1e921b440578
author Linus Torvalds <torvalds@linux-foundation.org> Mon Dec 20 21:33:12 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Dec 20 21:33:12 2010 -0800
tree b41b48c4ae5da770c20ba7ce00f6fa3d76b5a2a1
parent 9d5004fcf6e4e8caa9efbc25c9f85059b165329c
parent dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca

Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  Revert "USB: gadget: Allow function access to device ID data during bind()"
  USB: misc: uss720.c: add another vendor/product ID
  USB: usb-storage: unusual_devs entry for the Samsung YP-CP3
  USB: gadget: Remove suspended sysfs file before freeing cdev
  USB: core: Add input prompt and help text for USB_OTG config
  USB: ftdi_sio: Add D.O.Tec PID
  xhci: Fix issue with port array setup and buggy hosts.