tree 9beab6548a25710d1d8f950cadc0abbea754fa56
parent ecf318cc3daee6f41354cc781e2d4b766f7eec3e
parent 5bb4bd9895df508ed2bd8b3280252d8a8170e4ac
author Linus Torvalds <torvalds@linux-foundation.org> 1228147129 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228147129 -0800

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: serial: add more Onda device ids to option driver
  USB: usb-storage: unusual_devs entry for Nikon D2H
  USB: storage: unusual_devs entry for Mio C520-GPS
  USB: fsl_usb2_udc: Report disconnect before unbinding
  USB: fsl_qe_udc: Report disconnect before unbinding
  USB: fix SB600 USB subsystem hang bug
  Revert "USB: improve ehci_watchdog's side effect in CPU power management"