UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/sound/usb
History
Linus Torvalds 7a9b149212 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: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c
 		2010-05-20 21:26:12 -07:00
..
caiaq Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel 2010-04-16 10:37:41 +02:00
misc Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-05-20 21:26:12 -07:00
usx2y Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel 2010-04-16 10:37:41 +02:00
Kconfig Merge remote branch 'alsa/devel' into topic/usb 2010-03-23 14:56:33 +01:00
Makefile ALSA: usbmixer: rename usbmixer.[ch] -> mixer.[ch] 2010-03-12 12:20:49 +01:00
card.c ALSA: usb: fix usb build error when PM is not enabled 2010-03-22 17:07:36 +01:00
card.h ALSA: usb-audio: use a format bitmask per alternate setting 2010-03-05 08:18:32 +01:00
debug.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
endpoint.c ALSA: usb - use of kmalloc/kfree requires the include of slab.h 2010-03-29 08:23:27 +02:00
endpoint.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
format.c ALSA: usb - use of kmalloc/kfree requires the include of slab.h 2010-03-29 08:23:27 +02:00
format.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
helper.c ALSA: usb - use of kmalloc/kfree requires the include of slab.h 2010-03-29 08:23:27 +02:00
helper.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
midi.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-05-20 21:26:12 -07:00
midi.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
mixer.c Merge branch 'topic/usb' into for-linus 2010-05-20 11:59:43 +02:00
mixer.h ALSA: usb-mixer: Add support for Audio Class v2.0 2010-03-12 12:21:26 +01:00
mixer_maps.c ALSA: usbmixer: rename usbmixer.[ch] -> mixer.[ch] 2010-03-12 12:20:49 +01:00
mixer_quirks.c ALSA: usb - use of kmalloc/kfree requires the include of slab.h 2010-03-29 08:23:27 +02:00
mixer_quirks.h ALSA: usb-mixer: factor out quirks 2010-03-12 12:20:26 +01:00
pcm.c ALSA: usb pcm: use of kmalloc requires the include of slab.h 2010-03-29 10:04:07 +02:00
pcm.h ALSA: usb-audio: add support for samplerate setting on v2 devices 2010-03-05 08:19:17 +01:00
proc.c ALSA: usb-audio: use a format bitmask per alternate setting 2010-03-05 08:18:32 +01:00
proc.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
quirks-table.h ALSA: usbaudio: Add basic support for M-Audio Fast Track Ultra series 2010-03-25 12:26:44 +01:00
quirks.c ALSA: usb - use of kmalloc/kfree requires the include of slab.h 2010-03-29 08:23:27 +02:00
quirks.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
urb.c sound: fixup for usb_buffer_alloc/free rename 2010-05-20 21:15:18 -07:00
urb.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
usbaudio.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00