diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-02 09:12:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-02 09:12:44 +0200 |
| commit | c90e798c66d9c78079b45d6e05f0bbb704815106 (patch) | |
| tree | b15abb5f70d431c6baa815fc629e851b2650e8a0 /MAINTAINERS | |
| parent | staging: rtl8188eu: core: Fix coding style issue (diff) | |
| parent | wilc1000: move wilc driver out of staging (diff) | |
| download | linux-c90e798c66d9c78079b45d6e05f0bbb704815106.tar.xz linux-c90e798c66d9c78079b45d6e05f0bbb704815106.zip | |
Merge branch 'wilc1000-move-out-of-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next into staging-next
This is the movement of the wilc1000 driver out of staging, pulled in
here so that we do not end up doing duplicate work.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* 'wilc1000-move-out-of-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next:
wilc1000: move wilc driver out of staging
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 496fd4eafb68..0d2322414eab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11362,6 +11362,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Supported F: drivers/usb/gadget/udc/atmel_usba_udc.* +MICROCHIP WILC1000 WIFI DRIVER +M: Adham Abozaeid <adham.abozaeid@microchip.com> +M: Ajay Singh <ajay.kathat@microchip.com> +L: linux-wireless@vger.kernel.org +S: Supported +F: drivers/net/wireless/microchip/wilc1000/ + MICROCHIP XDMA DRIVER M: Ludovic Desroches <ludovic.desroches@microchip.com> L: linux-arm-kernel@lists.infradead.org @@ -16266,13 +16273,6 @@ M: Forest Bond <forest@alittletooquiet.net> S: Odd Fixes F: drivers/staging/vt665?/ -STAGING - WILC1000 WIFI DRIVER -M: Adham Abozaeid <adham.abozaeid@microchip.com> -M: Ajay Singh <ajay.kathat@microchip.com> -L: linux-wireless@vger.kernel.org -S: Supported -F: drivers/staging/wilc1000/ - STAGING SUBSYSTEM M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> L: devel@driverdev.osuosl.org |