Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:52 +0000 (12:48 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:52 +0000 (12:48 +0100)
commit97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9
treeabad2cc74e89d65514b501ad39fdf7a1c3546106
parent5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36
parente03f73a01f010b29504ceebda3c4fca25468516d
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
include/sound/soc.h
sound/soc/soc-core.c