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
..
cdc-acm.c	USB: cdc-acm: fix code indentation	2010-10-22 10:21:57 -07:00
cdc-acm.h	USB: cdc-acm: make bitfields unsigned	2010-05-20 13:21:31 -07:00
cdc-wdm.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
Kconfig	USB: add USB test and measurement class driver	2008-10-17 14:40:51 -07:00
Makefile	USB: add USB test and measurement class driver	2008-10-17 14:40:51 -07:00
usblp.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
usbtmc.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00