]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6bb51321738746c808c1634ad4d1217b03b779d3
tree2554500c3e743249afafd1857a3956aae1b2220e
parenta9f28f497ad45a1bdc9f52d953a669323b65d88d
parentd99c0983d993148c4e7f611982d39638d1defd9e
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