tree 7fd2b7d0f85f104009ef9edeb32806f6bbc47070
parent 7f05cc98bd9b10b9a0173f3f5d20c2223fdf7470
parent cb470087669a3fab1958fec79dd7db280b33f178
author Mark Brown <broonie@linaro.org> 1379420728 +0100
committer Mark Brown <broonie@linaro.org> 1379420728 +0100

Merge remote-tracking branch 'asoc/topic/component' into asoc-core

Conflicts:
	include/sound/soc.h