tree 4c144be49e1ade130571d0169e259e9966177962
parent 234c0b8fb0db790aaebec07d1d190e789d8ec7b9
parent 3d59400fe47e7e8bfb024cd1651433bef42e268e
author Mark Brown <broonie@linaro.org> 1394096859 +0800
committer Mark Brown <broonie@linaro.org> 1394096859 +0800

Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-enum

Conflicts:
	include/sound/soc.h