]> 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)
commit80b681b099bbfbb25e196dff56c26e1e1e2910ba
tree4c144be49e1ade130571d0169e259e9966177962
parent7f05bf1c29489cf9600e64e0ba70c2e8be445d4b
parent19b90874606486144a913b93a01c460874d44757
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