Takashi Iwai cc1b76ed32 Merge branch 'for-linus' into for-next ... Yet another non-trivial conflicts resolution for the recent HD-audio fix. Conflicts: sound/pci/hda/hda_intel.c Signed-off-by: Takashi Iwai <tiwai@suse.de>		2015-06-12 08:10:20 +02:00
..
ext	ALSA: hdac_ext: add extended stream capabilities	2015-06-11 11:59:22 +02:00
array.c	ALSA: hda - Move generic array helpers to core lib	2015-03-23 13:19:35 +01:00
hda_bus_type.c	ALSA: hda - add HDA default codec match function	2015-06-03 11:58:49 +02:00
hdac_bus.c	ALSA: hda - Add the controller helper codes to hda-core module	2015-04-16 07:27:58 +02:00
hdac_controller.c	ALSA: hda - moved alloc/free stream pages function to controller library	2015-04-16 07:31:22 +02:00
hdac_device.c	ALSA: hda - allow a codec to control the link power	2015-04-29 12:27:52 +02:00
hdac_i915.c	ALSA: hda - Allow calling snd_hdac_i915_*() without actual binding	2015-06-10 12:15:27 +02:00
hdac_regmap.c	ALSA: hda - Re-add the lost fake mute support	2015-06-11 11:55:48 +02:00
hdac_stream.c	ALSA: hda - Fix NULL dereference from CA0132 DSP loader	2015-05-19 11:35:13 +02:00
hdac_sysfs.c	ALSA: hda - Expose codec type sysfs	2015-04-13 10:43:54 +02:00
Kconfig	ALSA: hdac_ext: add extended HDA bus	2015-06-11 11:57:54 +02:00
local.h	ALSA: hda - Add widget sysfs tree	2015-03-23 13:17:27 +01:00
Makefile	ALSA: hdac_ext: add extended HDA bus	2015-06-11 11:57:54 +02:00
trace.c	ALSA: hda - Re-add tracepoints to HD-audio core driver	2015-03-23 13:17:58 +01:00
trace.h	ALSA: hda - add hdac stream trace	2015-05-18 10:06:20 +02:00