Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@linaro.org>
Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
commit387f837b3d9f9a989ae9a6deab543e1948b58ce8
tree6c471e04be1d304ce462da258103162f127af78d
parentd98812082c87732b45c71d63afc6a9ba3cca3f03
parent4da533932dedff930596bc536adaba1e508f9ffa
Merge branch 'topic/component' of git://git./linux/kernel/git/broonie/sound into asoc-core
include/sound/soc.h
sound/soc/soc-core.c