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)
commit6af5263ceaffc9d4403592dc81cd3b197702dc69
tree4c144be49e1ade130571d0169e259e9966177962
parent234c0b8fb0db790aaebec07d1d190e789d8ec7b9
parent3d59400fe47e7e8bfb024cd1651433bef42e268e
Merge branch 'topic/pcm' of git://git./linux/kernel/git/broonie/sound into asoc-enum

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