diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-19 10:26:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-19 10:26:53 -0500 |
| commit | 8b7d82878841cedefa6d52f52bb15a1b5947d441 (patch) | |
| tree | e560da5de4a74b35b483e877518e0b8e5e18ec43 /MAINTAINERS | |
| parent | ef58ca38dbda0642e293bcaa2e05edc79677c617 (diff) | |
| parent | 5f9066930b5da506b38be895b956ac5f854c374b (diff) | |
Merge tag 'wireless-drivers-next-for-davem-2018-01-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.16
Final few patches before the merge window, nothing really special.
ath9k
* add MSI support (not enabled by default yet)
rtlwifi
* support A-MSDU in A-MPDU aggregation
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3a28cee4f0ce..079af8b7ae8e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14771,9 +14771,9 @@ S: Maintained F: drivers/hid/hid-wiimote* WILOCITY WIL6210 WIRELESS DRIVER -M: Maya Erez <qca_merez@qca.qualcomm.com> +M: Maya Erez <merez@codeaurora.org> L: linux-wireless@vger.kernel.org -L: wil6210@qca.qualcomm.com +L: wil6210@qti.qualcomm.com S: Supported W: http://wireless.kernel.org/en/users/Drivers/wil6210 F: drivers/net/wireless/ath/wil6210/ |