projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8dd1fe 5f3484a)
Merge remote-tracking branch 'asoc/topic/component' into asoc-multi
authorMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
1  2 
sound/soc/soc-core.c patch | diff1 | diff2 | blob | history
sound/soc/soc-pcm.c patch | diff1 | diff2 | blob | history

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