Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Mon, 26 Oct 2015 02:16:13 +0000 (11:16 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 26 Oct 2015 02:16:13 +0000 (11:16 +0900)
commit71831ef6991138fa01fa3cc8e253b03e545e5af6
tree3f0f03f5c025e9b960a0fd2b3a40d7409cab961e
parent512def88cb67915edce1081327c0b280f02fbf19
parent3db7cb951835d6226d47e979bca7cacbbb8f9f1c
parent16566e47098211e30b3d8a0bc6a3576871ada8e8
parent7a5b8ba412b6217de8badaa52283588e50eeae08
parent4272975a3444f0abde1354285c5720d7819b41ed
Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic/samsung' and 'asoc/topic/sh' into asoc-next
sound/soc/codecs/rt298.c
sound/soc/sh/Kconfig