summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a451d4e 5954c4a edefc8f 2efb8a8 f4a2be1 da689e0)
raw | combined (merge: a451d4e 5954c4a edefc8f 2efb8a8 f4a2be1 da689e0)
author | Mark Brown <broonie@kernel.org> | |
Fri, 26 Jan 2018 15:27:31 +0000 (15:27 +0000) | ||
committer | Mark Brown <broonie@kernel.org> | |
Fri, 26 Jan 2018 15:27:31 +0000 (15:27 +0000) |
1 | 2 | 3 | 4 | 5 | 6 | |||
---|---|---|---|---|---|---|---|---|
sound/soc/codecs/rt5645.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | blob | history |
sound/soc/intel/boards/cht_bsw_rt5645.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | blob | history |
diff --cc sound/soc/codecs/rt5645.c
Simple merge
diff --cc sound/soc/intel/boards/cht_bsw_rt5645.c
Simple merge