projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5a3717 2213fc3)
Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:24 +0000 (13:45 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:24 +0000 (13:45 +0100)
1  2 
sound/soc/codecs/Kconfig patch | diff1 | diff2 | blob | history
sound/soc/codecs/Makefile patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
John Crispins staging tree