projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca7e5cb b1bc7b3)
Merge remote-tracking branch 'asoc/topic/log' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:09 +0000 (13:35 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:09 +0000 (13:35 +0900)
1  2 
sound/soc/soc-core.c patch | diff1 | diff2 | blob | history
sound/soc/soc-jack.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/soc/soc-jack.c
Simple merge
John Crispins staging tree