linux/sound
Takashi Iwai 0b2d711759 Merge branch 'for-linus' into for-next
Yet another non-trivial conflicts for HDA legacy stuff.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-06-16 12:48:21 +02:00
..
aoa ALSA: aoa: convert bus code to use dev_groups 2015-06-12 20:46:17 +02:00
arm ALSA: Deletion of checks before the function call "iounmap" 2015-01-04 15:13:45 +01:00
atmel ALSA: sound/atmel/ac97c.c: remove unused variable 2015-05-20 06:18:25 +02:00
core ALSA: jack: Fix the id uniqueness check 2015-05-29 14:06:32 +02:00
drivers ALSA: opl4: Fix / cleanup ifdef CONFIG_PROC_FS 2015-05-29 07:49:55 +02:00
firewire ALSA: bebob: add support for Behringer FCA 610/1616 2015-06-15 13:38:47 +02:00
hda Merge branch 'for-linus' into for-next 2015-06-12 08:10:20 +02:00
i2c ALSA: ak4xxx-adda: Drop unnecessary ifdef CONFIG_PROC_FS 2015-05-29 07:51:23 +02:00
isa ALSA: gus: use swap() in snd_ics_put_double() 2015-06-12 20:46:29 +02:00
mips ALSA: mips: let SND_SGI_O2 select SND_PCM 2015-06-15 13:21:58 +02:00
oss sound: oss/sb_audio: use swap() in sb_audio_close() 2015-06-12 20:46:29 +02:00
parisc ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
pci Merge branch 'for-linus' into for-next 2015-06-16 12:48:21 +02:00
pcmcia ALSA: vx: Fix missing kerneldoc parameter descriptions 2014-11-11 09:39:10 +01:00
ppc ALSA: ppc: keywest: check if DEQ was already instantiated 2015-05-29 12:54:10 +02:00
sh ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
soc ASoC: intel: Remove unused variable hsw 2015-06-08 21:04:24 +02:00
sparc ALSA: Include linux/io.h instead of asm/io.h 2015-01-28 16:49:33 +01:00
spi
synth ALSA: emux: Fix/cleanup old ifdef CONFIG_PROC_FS 2015-05-29 07:58:11 +02:00
usb ALSA: usb-audio: Set correct type for some UAC2 mixer controls. 2015-06-11 11:57:35 +02:00
ac97_bus.c
Kconfig ALSA: hda - Make snd_hda_bus_type public 2015-03-23 13:15:51 +01:00
last.c
Makefile ALSA: hda - Make snd_hda_bus_type public 2015-03-23 13:15:51 +01:00
sound_core.c
sound_firmware.c sound: sound_firmware: Fix invalid use of vfs_read() 2015-05-26 13:48:58 +02:00