Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 16:42:28 +0000 (17:42 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 16:42:28 +0000 (17:42 +0100)
commitaa0258adf6078a41a3db06f4e498253aff64d151
tree26d293e3cd249d2946c6def872fa4bd88ed65669
parent1a39019e939f620f39a1b914231ab6ba9013b208
parentb37f1d123c69c0d7730704d65b83eaac780c0e3b
Merge branch 'topic/component' of git://git./linux/kernel/git/broonie/sound into asoc-core

Conflicts:
sound/soc/soc-core.c
include/sound/soc.h
sound/soc/soc-core.c
sound/soc/soc-io.c