Takashi Iwai 4af88a9c1b Merge branch 'for-linus' into for-next ...

This merges and resolves the non-trivial conflicts with the recent fix
for hda-i915 binding fallback.

Conflicts:
	sound/pci/hda/hda_intel.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

2015-06-11 06:52:31 +02:00

..

aoa

ALSA: aoa: constify of_device_id array

2015-03-19 12:11:13 +01: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: firewire-lib: fix buffer-over-run when detecting packet discontinuity

2015-05-27 17:44:42 +02:00

hda

Merge branch 'for-linus' into for-next

2015-06-11 06:52:31 +02:00

i2c

ALSA: ak4xxx-adda: Drop unnecessary ifdef CONFIG_PROC_FS

2015-05-29 07:51:23 +02:00

isa

sound: Deparenthesize negative error returns

2015-03-24 11:41:37 +01:00

mips

ALSA: au1x00: fix error return code

2015-04-05 18:04:27 +02:00

oss

sound/oss: use schedule_timeout_interruptible()

2015-05-29 17:26:32 +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-11 06:52:31 +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

Merge branch 'for-linus' into for-next

2015-06-09 07:22:26 +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