From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 5 Feb 2015 20:30:43 +0000 (+0100)
Subject: Merge tag 'asoc-fix-intel-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~6036^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=deb08737e7ad6545e0fe19263f9221ecfdcfdd9f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'asoc-fix-intel-v3.19-rc7' of git://git./linux/kernel/git/broonie/sound into for-linus

ASoC: Fix for Intel firmware name

Another one liner that arrived after the earlier pull request.  There's
a trivial conflict with my -next branch, I'll send a pull request with
that resolution and some other new stuff before Monday.
---

deb08737e7ad6545e0fe19263f9221ecfdcfdd9f