Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 20 Nov 2013 15:20:38 +0000 (15:20 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 20 Nov 2013 15:20:38 +0000 (15:20 +0000)
1  2 
sound/soc/sh/rcar/core.c

Simple merge