Merge tag 'asoc-fix-intel-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel...
authorTakashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2015 20:30:43 +0000 (21:30 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2015 20:30:43 +0000 (21:30 +0100)
commitdeb08737e7ad6545e0fe19263f9221ecfdcfdd9f
tree673ffdfdea886aabe1169db0d2284eb7178fce0e
parent08c191de948d6cd9dc613db0683e2467ce44a18c
parent5c2b06369dafd796ebb4f17dab543d3da500245e
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.