Merge remote-tracking branch 'asoc/fix/rcar' into asoc-rcar
authorMark Brown <broonie@linaro.org>
Sat, 28 Jun 2014 13:41:15 +0000 (14:41 +0100)
committerMark Brown <broonie@linaro.org>
Sat, 28 Jun 2014 13:41:15 +0000 (14:41 +0100)
1  2 
sound/soc/sh/rcar/core.c

Simple merge