]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core
authorMark Brown <broonie@linaro.org>
Wed, 4 Dec 2013 11:54:29 +0000 (11:54 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 4 Dec 2013 11:54:29 +0000 (11:54 +0000)
commit7b045952e01c4d306c505a501062043824d14a8f
tree1ad64014dd6a5c898cdd9438844b630977d5e0ed
parent73b517eab80b457893bcb88cf868ede4d10aaed1
parentb15a626c3341be540c6731fad9a614c46eea9d7a
Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core

Conflicts (Trivial add/delete):
sound/soc/soc-pcm.c
sound/soc/soc-pcm.c