2 Commits

Author	SHA1	Message	Date
Christian Engelmayer	dd1b94bf49	ASoC: Intel: Fix a self assignment in sst_mem_block_alloc_scratch() ... Remove a self assignment in sst_mem_block_alloc_scratch(). When calculating buffer sizes there is no need for statements without effect. Detected by Coverity: CID 1195249. Signed-off-by: Christian Engelmayer <cengelma@gmx.at> Signed-off-by: Mark Brown <broonie@linaro.org>	2014-04-15 12:12:34 +01:00
Mark Brown	a4b12990b6	Merge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/rcar' into asoc-next	2014-03-12 23:04:35 +00:00