Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rockchip', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)
1  2  3  4  5 
sound/soc/codecs/Kconfig
sound/soc/sh/rcar/core.c

Simple merge
Simple merge