Takashi Iwai 19566b0bd9 Merge branch 'for-linus' into for-next ... This merges the USB-audio disconnect fix and resolves the conflicts so that we can continue working on development of usb-audio stuff. Conflicts: sound/usb/card.c		2014-11-05 15:37:22 +01:00
..
aoa	ALSA: aoa: Use snd_ctl_elem_info()	2014-10-21 08:08:36 +02:00
arm	ASoC: pxa2xx-ac97: prepare and unprepare the clocks	2014-06-09 21:11:18 +01:00
atmel	dmaengine: dw: split dma-dw.h to platform and private parts	2014-10-15 20:31:04 +05:30
core	Merge branch 'for-linus' into for-next	2014-11-05 15:37:22 +01:00
drivers	ALSA: vx: Use snd_ctl_elem_info()	2014-10-21 08:12:15 +02:00
firewire	Merge branch 'for-linus' into for-next	2014-10-27 14:11:07 +01:00
i2c	ALSA: ak4xxx-adda: Use snd_ctl_enum_info()	2014-10-21 08:29:54 +02:00
isa	ALSA: es18xx: Add GPO controls	2014-11-04 10:31:30 +01:00
mips	ALSA: mips: Use snd_ctl_enum_info()	2014-10-21 08:36:44 +02:00
oss	sound fixes for 3.17-rc1	2014-08-15 18:06:56 -06:00
parisc	ALSA: parisc: Use snd_ctl_enum_info()	2014-10-21 08:37:36 +02:00
pci	Merge branch 'for-linus' into for-next	2014-11-05 15:37:22 +01:00
pcmcia	ALSA: pdaudiocf: Use nonatomic PCM ops	2014-09-15 15:52:38 +02:00
ppc	ALSA: ppc: Use snd_ctl_enum_info()	2014-10-21 09:13:59 +02:00
sh
soc	Merge remote-tracking branches 'asoc/fix/adau1761', 'asoc/fix/fsl', 'asoc/fix/intel', 'asoc/fix/s6000' and 'asoc/fix/sgtl5000' into asoc-linus	2014-10-27 11:17:41 +00:00
sparc	ALSA: sparc: Use snd_ctl_enum_info()	2014-10-21 09:14:28 +02:00
spi
synth
usb	Merge branch 'for-linus' into for-next	2014-11-05 15:37:22 +01:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c