alistair23-linux/include/linux/usb
Linus Torvalds 5cc1035062 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: (141 commits)
  USB: mct_u232: fix broken close
  USB: gadget: amd5536udc.c: fix error path
  USB: imx21-hcd - fix off by one resource size calculation
  usb: gadget: fix Kconfig warning
  usb: r8a66597-udc: Add processing when USB was removed.
  mxc_udc: add workaround for ENGcm09152 for i.MX35
  USB: ftdi_sio: add device ids for ScienceScope
  USB: musb: AM35x: Workaround for fifo read issue
  USB: musb: add musb support for AM35x
  USB: AM35x: Add musb support
  usb: Fix linker errors with CONFIG_PM=n
  USB: ohci-sh - use resource_size instead of defining its own resource_len macro
  USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
  USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
  USB: xhci: Fix compile error when CONFIG_PM=n
  USB: accept some invalid ep0-maxpacket values
  USB: xHCI: PCI power management implementation
  USB: xHCI: bus power management implementation
  USB: xHCI: port remote wakeup implementation
  USB: xHCI: port power management implementation
  ...

Manually fix up (non-data) conflict: the SCSI merge gad renamed the
'hw_sector_size' member to 'physical_block_size', and the USB tree
brought a new use of it.
2010-10-22 20:30:48 -07:00
..
association.h
atmel_usba_udc.h
audio-v2.h
audio.h
c67x00.h
cdc.h USB: cdc.h: ncm: fix one more typo 2010-10-22 10:21:48 -07:00
ch9.h usb: usb3.0 ch9 definitions 2010-10-22 10:22:07 -07:00
ch11.h
composite.h
ehci_def.h
functionfs.h
g_hid.h
g_printer.h
gadget.h
gadgetfs.h
gpio_vbus.h
hcd.h USB: introduce unmap_urb_setup_for_dma() 2010-10-22 10:22:03 -07:00
input.h
intel_mid_otg.h
iowarrior.h
irda.h
isp116x.h
isp1362.h
isp1760.h
Kbuild
langwell_otg.h
langwell_udc.h
m66592.h
midi.h
musb.h
net2280.h
otg.h USB: Add more empty functions in otg.h 2010-10-22 10:21:57 -07:00
quirks.h
r8a66597.h
rndis_host.h
serial.h
sl811.h
storage.h USB: Move USB Storage definitions to their own header file 2010-10-22 10:21:50 -07:00
tmc.h
ulpi.h
usbnet.h
video.h
wusb-wa.h
wusb.h