diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-10 18:55:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-10 18:55:12 +0100 |
| commit | 54a3da1c105ca91c4d32f25c3d9c57a61e9a3467 (patch) | |
| tree | 5be69ff9ccab03760f2ae17cbaecbfea0b016087 /MAINTAINERS | |
| parent | 1c8bc7b3de5e76cb89aacdc7be1475a028af505f (diff) | |
| parent | 90a3b7f8aba3011badacd6d8121e03aa24ac79d1 (diff) | |
Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 161b26e05732..d3814c46d60a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13432,9 +13432,8 @@ F: drivers/i2c/busses/i2c-synquacer.c F: Documentation/devicetree/bindings/i2c/i2c-synquacer.txt SOCIONEXT UNIPHIER SOUND DRIVER -M: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) -S: Maintained +S: Orphan F: sound/soc/uniphier/ SOEKRIS NET48XX LED SUPPORT |