]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm
authorMark Brown <broonie@linaro.org>
Mon, 5 Aug 2013 17:12:39 +0000 (18:12 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 5 Aug 2013 17:12:39 +0000 (18:12 +0100)
commit7c009742555bcd85eb6621b595f25d77c8ad9893
tree92a6b7232a02ed69b86219e8f125e08bf95f3837
parent5a4cf7a533a3e833d27822d104ba8b442f09c58e
parente99c946db456c82406883a54ac290a938ffa2fcf
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm

Trivial add/add conflicts:
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile