projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef179a7 fde7f9d)
Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
1  2 
sound/soc/rockchip/rk3399_gru_sound.c patch | diff1 | diff2 | blob | history
sound/soc/rockchip/rockchip_i2s.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/rockchip/rk3399_gru_sound.c
Simple merge
diff --cc sound/soc/rockchip/rockchip_i2s.c
Simple merge
Domain: System / Kernel;