Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 9 Jun 2015 05:22:26 +0000 (07:22 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 9 Jun 2015 05:22:26 +0000 (07:22 +0200)
commit8654844cf51d434dad5d4d9f48dc99d1ac89aad7
treece1ad2eb865c6f5e15b4f7f119e05e439d675a53
parent01ec65c812ef829c815d2f37a97cc4eb7925f8ae
parent132bd96bc56f9cafd24b71de389984d0e83a0956
Merge branch 'for-linus' into for-next

Resolve the non-trivial conflict due to the hdac regmap API changes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_codec.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_via.c