OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
176d1ed426
linux/drivers/usb/gadget
History
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
..
amd5536udc.c USB: gadget: amd5536udc.c: fix error path 2010-10-22 10:22:19 -07:00
amd5536udc.h
at91_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
at91_udc.h
atmel_usba_udc.c USB: atmel_usba_udc: force vbus_pin at -EINVAL when gpio_request failled 2010-10-22 10:21:47 -07:00
atmel_usba_udc.h
audio.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
cdc2.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
ci13xxx_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
ci13xxx_udc.h
composite.c usb gadget: composite: prevent OOPS for non-standard control request 2010-10-22 10:21:37 -07:00
config.c
dbgp.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
dummy_hcd.c usb: gadget: dummy_hcd: Fix error path 2010-10-22 10:22:06 -07:00
epautoconf.c
ether.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
f_acm.c USB: Change acm_iad_descriptor bFunctionProtocol to USB_CDC_ACM_PROTO_AT_V25TER 2010-10-22 10:21:35 -07:00
f_audio.c
f_ecm.c
f_eem.c
f_fs.c USB: gadget: f_fs: use usb_string_ids_n() 2010-08-10 14:35:36 -07:00
f_hid.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
f_loopback.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
f_mass_storage.c USB: gadget: storage: reuse definitions from scsi.h header file 2010-10-22 10:22:07 -07:00
f_obex.c
f_phonet.c
f_rndis.c
f_serial.c
f_sourcesink.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
f_subset.c
f_uvc.c
f_uvc.h
file_storage.c USB: gadget: storage: reuse definitions from scsi.h header file 2010-10-22 10:22:07 -07:00
fsl_mxc_udc.c mxc_udc: add workaround for ENGcm09152 for i.MX35 2010-10-22 10:22:17 -07:00
fsl_qe_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
fsl_qe_udc.h
fsl_udc_core.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
fsl_usb2_udc.h
g_ffs.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
g_zero.h
gadget_chips.h
gmidi.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
goku_udc.c usb: gadget: goku_udc: Fix error path 2010-10-22 10:22:04 -07:00
goku_udc.h
hid.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
imx_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
imx_udc.h
inode.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
Kconfig usb: gadget: fix Kconfig warning 2010-10-22 10:22:18 -07:00
langwell_udc.c usb: langwell_udc: cancel pending requests when controller is suspended. 2010-10-22 10:22:00 -07:00
langwell_udc.h USB: langwell: USB Client driver memory handling 2010-10-22 10:21:19 -07:00
lh7a40x_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
lh7a40x_udc.h
m66592-udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
m66592-udc.h
Makefile usb: makefile cleanup 2010-10-22 10:22:07 -07:00
mass_storage.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
multi.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
ndis.h
net2280.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
net2280.h
nokia.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
omap_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
omap_udc.h
printer.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
pxa25x_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
pxa25x_udc.h
pxa27x_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
pxa27x_udc.h
r8a66597-udc.c usb: r8a66597-udc: Add processing when USB was removed. 2010-10-22 10:22:18 -07:00
r8a66597-udc.h USB: r8a66597-udc: Initialize uninitialized variable, fix compile warning 2010-10-22 10:21:34 -07:00
rndis.c USB: gadget: rndis: fix up coding style issues in the file 2010-10-22 10:21:30 -07:00
rndis.h USB: rndis: section mismatch fix 2010-09-03 17:33:40 -07:00
s3c2410_udc.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
s3c2410_udc.h
s3c-hsotg.c usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
serial.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
storage_common.c USB: gadget: storage: reuse definitions from scsi.h header file 2010-10-22 10:22:07 -07:00
u_audio.c
u_audio.h
u_ether.c usb: throw away custom hex digit methods 2010-08-10 14:35:35 -07:00
u_ether.h
u_phonet.h
u_serial.c USB: gadget: compilation issue: missing TASK_INTERRUPTIBLE 2010-08-10 14:35:38 -07:00
u_serial.h
usbstring.c
uvc_queue.c
uvc_queue.h
uvc_v4l2.c USB: uvc_v4l2: cleanup test for end of loop 2010-08-23 20:50:14 -07:00
uvc_video.c
uvc.h
webcam.c usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
zero.c usb gadget: don't save bind callback in struct usb_composite_driver 2010-10-22 10:21:25 -07:00