Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Thu, 6 Mar 2014 09:07:39 +0000 (17:07 +0800)
committerMark Brown <broonie@linaro.org>
Thu, 6 Mar 2014 09:07:39 +0000 (17:07 +0800)
Conflicts:
include/sound/soc.h


Trivial merge