projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24ecc23 6e588a0)
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:51:57 +0000 (15:51 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:51:57 +0000 (15:51 +0100)
1  2 
sound/soc/soc-dapm.c patch | diff1 | diff2 | blob | history
sound/soc/soc-topology.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/soc-dapm.c
Simple merge
diff --cc sound/soc/soc-topology.c
Simple merge
Domain: System / Kernel;