diff options
author | Benson Leung <bleung@chromium.org> | 2018-04-10 08:00:04 +0200 |
---|---|---|
committer | Benson Leung <bleung@chromium.org> | 2018-04-10 08:00:04 +0200 |
commit | 72655f6cf7fe04b867776bb7120fbdb84dee4f61 (patch) | |
tree | 000347fc0721362eb43b0449f1b3484f2696ad3b /MAINTAINERS | |
parent | platform/chrome: cros_ec_lpc: Add support for Google devices using custom cor... (diff) | |
parent | Input: atmel_mxt_ts - remove platform data support (diff) | |
download | linux-72655f6cf7fe04b867776bb7120fbdb84dee4f61.tar.xz linux-72655f6cf7fe04b867776bb7120fbdb84dee4f61.zip |
Merge remote-tracking branch 'chrome-platform-stop-being-a-platform-driver-plus-atmel_mxt_ts-for-v4.17' into working-branch-for-4.17
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 73c0cdabf755..d4b0b09d2e3f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2394,7 +2394,6 @@ T: git git://github.com/ndyer/linux.git S: Maintained F: Documentation/devicetree/bindings/input/atmel,maxtouch.txt F: drivers/input/touchscreen/atmel_mxt_ts.c -F: include/linux/platform_data/atmel_mxt_ts.h ATMEL SAMA5D2 ADC DRIVER M: Ludovic Desroches <ludovic.desroches@microchip.com> |