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)
commit7d930ce26e01470590cd003484b32df29529906c
tree7fd2b7d0f85f104009ef9edeb32806f6bbc47070
parent7f05cc98bd9b10b9a0173f3f5d20c2223fdf7470
parentcb470087669a3fab1958fec79dd7db280b33f178
Merge remote-tracking branch 'asoc/topic/component' into asoc-core

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