Merge remote-tracking branch 'asoc/topic/component' into asoc-core
authorMark Brown <broonie@linaro.org>
Tue, 17 Sep 2013 12:25:28 +0000 (13:25 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 17 Sep 2013 12:25:28 +0000 (13:25 +0100)
Conflicts:
include/sound/soc.h


Trivial merge