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)
Conflicts:
sound/soc/soc-core.c


Trivial merge