Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:34 +0000 (10:43 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:34 +0000 (10:43 +0000)
commit9686e4b2a89375aa72aa9c7a9beea2cd71479941
tree2b08d07f1335fcb01515496ac65c86aca8354272
parent469cb9286ef79deda50e67391bada7fa78337dff
parenta2b4f8a473efd82d634117a057e0ba64443354cf
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
include/sound/rcar_snd.h
sound/soc/sh/rcar/rsnd.h