Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 4 Nov 2013 06:04:19 +0000 (22:04 -0800)
committerMark Brown <broonie@linaro.org>
Mon, 4 Nov 2013 06:04:19 +0000 (22:04 -0800)

Trivial merge