]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit766bcf4e5b3c093f75883c141d2d82b8dc04afcd
tree673ffdfdea886aabe1169db0d2284eb7178fce0e
parenta5a65dccb767ba5a7edaaee6772559835e099d0e
parentc24144624a7981880899b8faa9476794d8c862ba
Merge tag 'asoc-fix-intel-v3.19-rc7' of git://git.kernel.org/pub/scm/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.