From: Takashi Iwai Date: Mon, 17 Nov 2014 21:16:03 +0000 (+0100) Subject: Merge tag 'asoc-v3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~85^2~2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39ae97ea4b773be81bae9eec08ed1e5c53606c1a;p=pandora-kernel.git Merge tag 'asoc-v3.18-rc5' of git://git./linux/kernel/git/broonie/sound into for-linus ASoC: Fixes for v3.18 As well as the usual driver fixes there's a few other things here: One is a fix for a race in DPCM which is unfortuantely a rather large diffstat, this is the result of growing usage of the mainline code and hence more detailed testing so I'm relatively happy. The other is a fix for non-DT machine driver matching following some of the componentization work which is much more focused. Both have had a while to cook in -next. --- 39ae97ea4b773be81bae9eec08ed1e5c53606c1a