linux/sound/pci/hda
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
..
ca0132_regs.h ALSA: hda: ca0132_regs.h: Fix typo in include guard 2014-08-22 11:24:11 +02:00
dell_wmi_helper.c ALSA: hda - add mic mute led hook for dell machines 2014-07-31 09:21:42 +02:00
hda_auto_parser.c ALSA: hda - Move a part of hda_codec stuff into hdac_device 2015-03-23 13:17:17 +01:00
hda_auto_parser.h ALSA: hda - Sort input pins depending on amp caps 2014-09-23 15:57:32 +02:00
hda_beep.c ALSA: hda - Move a part of hda_codec stuff into hdac_device 2015-03-23 13:17:17 +01:00
hda_beep.h ALSA: hda - Adjust power of beep widget and outputs 2015-03-18 09:23:10 +01:00
hda_bind.c ALSA: hda - Drop unused fields from struct hda_codec_preset 2015-05-28 14:46:55 +02:00
hda_codec.c Merge branch 'for-linus' into for-next 2015-06-12 08:10:20 +02:00
hda_codec.h ALSA: hda: Intel: enable automatic runtime pm for HDMI codecs by default 2015-06-09 11:58:37 +02:00
hda_controller_trace.h ALSA: hda - rename hda_intel_trace.h to hda_controller_trace.h 2015-05-18 10:06:32 +02:00
hda_controller.c ALSA: hda - rename hda_intel_trace.h to hda_controller_trace.h 2015-05-18 10:06:32 +02:00
hda_controller.h Merge branch 'topic/hda' into for-next 2015-04-29 12:28:52 +02:00
hda_eld.c ALSA: replace CONFIG_PROC_FS with CONFIG_SND_PROC_FS 2015-05-27 21:25:19 +02:00
hda_generic.c ALSA: hda - Set stream_pm ops automatically by generic parser 2015-05-27 08:39:27 +02:00
hda_generic.h ALSA: hda - Fix power of pins used for mute LED with vrefs 2015-03-20 18:30:48 +01:00
hda_hwdep.c ALSA: hda - Add card field to hda_codec struct 2015-03-03 11:25:16 +01:00
hda_intel_trace.h ALSA: hda - add hda_intel_trace.h 2015-05-18 10:06:44 +02:00
hda_intel.c Merge branch 'for-linus' into for-next 2015-06-12 08:10:20 +02:00
hda_intel.h ALSA: hda - Move hda_i915.c from sound/pci/hda to sound/hda 2015-05-20 06:16:36 +02:00
hda_jack.c ALSA: hda - Update to use the new jack kctls method 2015-04-27 21:37:42 +02:00
hda_jack.h ALSA: hda - Update to use the new jack kctls method 2015-04-27 21:37:42 +02:00
hda_local.h Merge branch 'for-linus' into for-next 2015-06-12 08:10:20 +02:00
hda_proc.c ALSA: hda - potential (but unlikely) uninitialized variable 2015-04-17 15:32:17 +02:00
hda_sysfs.c ALSA: hda - Move a part of hda_codec stuff into hdac_device 2015-03-23 13:17:17 +01:00
hda_tegra.c ALSA: hda/tegra - Improve error reporting 2015-05-18 10:03:25 +02:00
Kconfig ALSA: hda - Move hda_i915.c from sound/pci/hda to sound/hda 2015-05-20 06:16:36 +02:00
local.h ALSA: hda - Move a part of hda_codec stuff into hdac_device 2015-03-23 13:17:17 +01:00
Makefile ALSA: replace CONFIG_PROC_FS with CONFIG_SND_PROC_FS 2015-05-27 21:25:19 +02:00
patch_analog.c ALSA: hda - Set patch_ops before calling auto-parser 2015-05-29 10:42:14 +02:00
patch_ca0110.c ALSA: hda - Set patch_ops before calling auto-parser 2015-05-29 10:42:14 +02:00
patch_ca0132.c ALSA: hda - Set patch_ops before calling auto-parser 2015-05-29 10:42:14 +02:00
patch_cirrus.c ALSA: hda - Set patch_ops before calling auto-parser 2015-05-29 10:42:14 +02:00
patch_cmedia.c ALSA: hda - Set patch_ops before calling auto-parser 2015-05-29 10:42:14 +02:00
patch_conexant.c ALSA: hda - Set patch_ops before calling auto-parser 2015-05-29 10:42:14 +02:00
patch_hdmi.c ALSA: hda: Intel: enable automatic runtime pm for HDMI codecs by default 2015-06-09 11:58:37 +02:00
patch_realtek.c Merge branch 'for-linus' into for-next 2015-06-09 07:22:26 +02:00
patch_si3054.c ALSA: hda - Use regmap for command verb caches, too 2015-03-23 13:19:41 +01:00
patch_sigmatel.c ALSA: hda - Set patch_ops before calling auto-parser 2015-05-29 10:42:14 +02:00
patch_via.c Merge branch 'for-linus' into for-next 2015-06-09 07:22:26 +02:00
thinkpad_helper.c Revert "ALSA: hda - Add mute-LED mode control to Thinkpad" 2015-05-24 08:32:37 +02:00