]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 17 Jan 2013 06:31:54 +0000 (15:31 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 17 Jan 2013 06:31:54 +0000 (15:31 +0900)
commit4706ccbbe89c0c1871134f493de8b27864b869ba
treead8c359e136c2f0ef908ac0c03f3a0fba4ab7a57
parentc98137bfcb4afd4415864258dd8ecf05c2bb5843
parentb59e0f82aa350e380142353fbd30706092ba6312
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona

Conflicts:
sound/soc/codecs/arizona.c
sound/soc/codecs/arizona.c