| commit | deb08737e7ad6545e0fe19263f9221ecfdcfdd9f | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Thu Feb 05 21:30:43 2015 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Thu Feb 05 21:30:43 2015 +0100 |
| tree | 673ffdfdea886aabe1169db0d2284eb7178fce0e | |
| parent | 08c191de948d6cd9dc613db0683e2467ce44a18c [diff] | |
| parent | 5c2b06369dafd796ebb4f17dab543d3da500245e [diff] |
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.