]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'topic/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 7 Nov 2012 08:52:02 +0000 (09:52 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 7 Nov 2012 08:52:02 +0000 (09:52 +0100)
commitfde107673d600b8bea0c560c24c23959502e3b76
tree2988e2407cf01f45926874ff0a54f903a23579ee
parent6f84d790372423d9bd75e10a8f559b3544e6ca13
parent804f5ba7e81bde8e36dba10eb5bdeca4552dd01b
Merge branch 'topic/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next

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