tree ef5e7274559ec6fcdc9b758411a9c7a07cab0711
parent 91f7b5c41811154706448b2bf500000cbbfa96ba
parent 14e51f28ade783cd948cd10202a696ff7e5d33d6
author Linus Torvalds <torvalds@woody.osdl.org> 1168071021 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1168071021 -0800

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: asix: Fix AX88772 device PHY selection
  USB: usblp.c - add Kyocera Mita FS 820 to list of "quirky" printers
  sisusb_con warning fixes
  USB: Fixed bug in endpoint release function.
  USB: small update to Documentation/usb/acm.txt
  USB storage: fix ipod ejecting issue
  USB Storage: unusual_devs: add supertop drives
  USB: omap_udc build fixes (sync with linux-omap)
  USB: funsoft is borken on sparc
  USB: fix interaction between different interfaces in an "Option" usb device
  UHCI: support device_may_wakeup
  UHCI: make test for ASUS motherboard more specific