]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2bfe43b4d013f744ded1d4f2ed163dedcf865d43
tree4c144be49e1ade130571d0169e259e9966177962
parent841e83df1ad03a4ed8ad37694539040386701d81
parent37c5360a8d89cd43c1c9b3279fc4c56d2a76ffd2
Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/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