diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 18:05:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 18:05:33 -0400 |
| commit | 59c0b586aebdfff2c79d61139a2f5ea3b6d62675 (patch) | |
| tree | 2accc49ecfc9673aaeba03fc91e56611c61d4aa0 /Documentation | |
| parent | b25eaebc6c5072164fef6f288a3e93241cc78bb7 (diff) | |
| parent | 4238ef54690ea502a22aab41c377f23588c387d0 (diff) | |
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: gadget: Fix EEM driver comments and VID/PID
usb-storage: Workaround devices with bogus sense size
USB: ehci: Fix IST boundary checking interval math.
USB: option: Support for AIRPLUS MCD650 Datacard
USB: whci-hcd: always do an update after processing a halted qTD
USB: whci-hcd: handle early deletion of endpoints
USB: wusb: don't use the stack to read security descriptor
USB: rename Documentation/ABI/.../sysfs-class-usb_host
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc (renamed from Documentation/ABI/testing/sysfs-class-usb_host) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-usb_host b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc index 46b66ad1f1b4..4e8106f7cfd9 100644 --- a/Documentation/ABI/testing/sysfs-class-usb_host +++ b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | What: /sys/class/usb_host/usb_hostN/wusb_chid | 1 | What: /sys/class/uwb_rc/uwbN/wusbhc/wusb_chid |
| 2 | Date: July 2008 | 2 | Date: July 2008 |
| 3 | KernelVersion: 2.6.27 | 3 | KernelVersion: 2.6.27 |
| 4 | Contact: David Vrabel <david.vrabel@csr.com> | 4 | Contact: David Vrabel <david.vrabel@csr.com> |
| @@ -9,7 +9,7 @@ Description: | |||
| 9 | 9 | ||
| 10 | Set an all zero CHID to stop the host controller. | 10 | Set an all zero CHID to stop the host controller. |
| 11 | 11 | ||
| 12 | What: /sys/class/usb_host/usb_hostN/wusb_trust_timeout | 12 | What: /sys/class/uwb_rc/uwbN/wusbhc/wusb_trust_timeout |
| 13 | Date: July 2008 | 13 | Date: July 2008 |
| 14 | KernelVersion: 2.6.27 | 14 | KernelVersion: 2.6.27 |
| 15 | Contact: David Vrabel <david.vrabel@csr.com> | 15 | Contact: David Vrabel <david.vrabel@csr.com> |