![]() 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> |
||
---|---|---|
.. | ||
ext | ||
array.c | ||
hda_bus_type.c | ||
hdac_bus.c | ||
hdac_controller.c | ||
hdac_device.c | ||
hdac_i915.c | ||
hdac_regmap.c | ||
hdac_stream.c | ||
hdac_sysfs.c | ||
Kconfig | ||
local.h | ||
Makefile | ||
trace.c | ||
trace.h |