diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 18:01:22 +0200 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 18:01:22 +0200 |
commit | 6a84872a3c3090993be108f02f91b4de062a7d32 (patch) | |
tree | eb9029dda4b56efdc1488a8683c00c711075ca18 /MAINTAINERS | |
parent | Merge branch 'at91-3.15-fixes' into at91-3.16-dt3 (diff) | |
parent | ARM: at91/dt: at91-cosino_mega2560 remove useless tsadcc node (diff) | |
download | linux-6a84872a3c3090993be108f02f91b4de062a7d32.tar.xz linux-6a84872a3c3090993be108f02f91b4de062a7d32.zip |
Merge branch 'at91-3.16-cleanup' into at91-3.16-dt3
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 106626442124..285e03fcfed9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1617,12 +1617,6 @@ S: Supported F: drivers/misc/atmel_tclib.c F: drivers/clocksource/tcb_clksrc.c -ATMEL TSADCC DRIVER -M: Josh Wu <josh.wu@atmel.com> -L: linux-input@vger.kernel.org -S: Supported -F: drivers/input/touchscreen/atmel_tsadcc.c - ATMEL USBA UDC DRIVER M: Nicolas Ferre <nicolas.ferre@atmel.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |