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
..
aoa	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
arm	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
atmel	ALSA: AC97: add full duplex support for atmel AT91 and AVR.	2010-03-25 20:22:36 +01:00
core	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
drivers	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
i2c	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
isa	Merge branch 'topic/misc' into for-linus	2010-05-20 11:59:29 +02:00
mips	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
oss	m68k: amiga - Sound platform device conversion	2010-05-17 21:37:44 +02:00
parisc	ALSA: sound/parisc: Move dereference after NULL test	2009-10-30 12:01:38 +01:00
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
pcmcia	pcmcia: dev_node removal (write-only drivers)	2010-05-10 10:23:14 +02:00
ppc	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
sh	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
soc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
sparc	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
spi	ALSA: Convert to snd_card_create() in other sound/*	2009-01-12 15:21:19 +01:00
synth	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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
ac97_bus.c	ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration	2008-12-02 16:25:37 +01:00
Kconfig	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
last.c
Makefile	ALSA: Add Atmel ALSA drivers directory	2009-02-05 15:08:53 +01:00
sound_core.c	ALSA: use subsys_initcall for sound core instead of module_init	2010-01-14 21:21:47 +01:00
sound_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