| author | Mark Brown <broonie@kernel.org> | |
| Fri, 22 Jun 2018 14:47:23 +0000 (15:47 +0100) | ||
| committer | Mark Brown <broonie@kernel.org> | |
| Fri, 22 Jun 2018 14:47:23 +0000 (15:47 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| sound/soc/sh/rcar/core.c | patch | | diff1 | | diff2 | | blob | history |
| sound/soc/sh/rcar/ssi.c | patch | | diff1 | | diff2 | | blob | history |
| sound/soc/soc-dapm.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc sound/soc/sh/rcar/core.c
Simple merge
diff --cc sound/soc/sh/rcar/ssi.c
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge