OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5cc1035062
linux/drivers/usb/misc
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
..
sisusbvga usb: makefile cleanup 2010-10-22 10:22:07 -07:00
adutux.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
appledisplay.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
cypress_cy7c63.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
cytherm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
emi26.c USB misc: make USB device id constant 2010-03-02 14:54:17 -08:00
emi62.c USB misc: make USB device id constant 2010-03-02 14:54:17 -08:00
ftdi-elan.c usb: ftdi-elan: Convert "mutex" to semaphore 2010-10-22 10:21:31 -07:00
idmouse.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
iowarrior.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
isight_firmware.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Kconfig USB: add driver for Meywa-Denki & Kayac YUREX 2010-10-22 10:21:51 -07:00
ldusb.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
legousbtower.c USB: misc: Remove unnecessary casts of private_data 2010-08-10 14:35:39 -07:00
Makefile usb: makefile cleanup 2010-10-22 10:22:07 -07:00
rio500_usb.h
rio500.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
trancevibrator.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
usb_u132.h
usblcd.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
usbled.c USB misc: make USB device id constant 2010-03-02 14:54:17 -08:00
usbsevseg.c USB: fixed bug in usbsevseg using USB autosuspend incorrectly 2010-04-22 15:18:21 -07:00
usbtest.c USB: usbtest - ensure correct isoc data length 2010-10-22 10:22:01 -07:00
uss720.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
yurex.c USB: yurex: fix memory leak and corrupted messages 2010-10-22 10:21:52 -07:00