Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2015 06:10:20 +0000 (08:10 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2015 06:10:20 +0000 (08:10 +0200)
commitcc1b76ed32607ba378986931e73b64231085816f
tree2554500c3e743249afafd1857a3956aae1b2220e
parent9e8af74c38162c884465385a7f1ded1c98cdc752
parent535115b5ff51c702a9a22feb918707c2fe1fbd17
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>
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_local.h