Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
authorMark Brown <broonie@linaro.org>
Sun, 23 Mar 2014 14:00:58 +0000 (14:00 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 23 Mar 2014 14:00:58 +0000 (14:00 +0000)
1  2 
sound/soc/sh/rcar/core.c

Simple merge