git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7480800 2d30b57)
Merge remote-tracking branch 'asoc/fix/adsp' into asoc-adsp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 28 Jan 2013 16:51:05 +0000 (00:51 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 28 Jan 2013 16:51:05 +0000 (00:51 +0800)
Conflicts:
sound/soc/codecs/wm_adsp.c


Trivial merge
Pandora Kernel Repository