projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c006062 a1abfa8)
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:00 +0000 (00:22 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:00 +0000 (00:22 +0900)
1  2 
sound/soc/codecs/arizona.c patch | diff1 | diff2 | blob | history
sound/soc/codecs/wm_adsp.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/arizona.c
Simple merge
diff --cc sound/soc/codecs/wm_adsp.c
Simple merge
John Crispins staging tree