]> 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)
commite1efe00c68d21cb0cb76af864bb1dcd2fbd2fe18
tree2554500c3e743249afafd1857a3956aae1b2220e
parent78807fd306196452b8fc3a12361074ef88ec22f4
parent6ab9beb9047e8b7d2355ca49680288810a2fde5a
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