From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Fri, 17 Nov 2006 00:39:46 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.19~82
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0e12c5e85e6fe0a247d547a28a1884915cd3f5b9;p=~emulex%2Finfiniband.git

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: auerswald possible memleak fix
  USB: ipaq: Add HTC Modem Support
  USB: Fixed outdated usb_get_device_descriptor() documentation
  usb-storage: Remove duplicated unusual_devs.h entries for Sony Ericsson P990i
  USB: hid-core: Add quirk for new Apple keyboard/trackpad
  USB Storage: unusual_devs.h entry for Sony Ericsson P990i
  USB: correct keymapping on Powerbook built-in USB ISO keyboards
  USB: OHCI: fix root-hub resume bug
  USB: Fix UCR-61S2B unusual_dev entry
  USB: ftdi driver pid for dmx-interfaces
  USB: ftdi_sio: adds vendor/product id for a RFID construction kit
  OHCI: disallow autostop when wakeup is not available
---

0e12c5e85e6fe0a247d547a28a1884915cd3f5b9