diff options
author | David S. Miller <davem@davemloft.net> | 2017-11-04 12:07:50 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-04 12:07:50 +0300 |
commit | 6e300769dcbaba7bfacbc02ec9c3fcc595eec755 (patch) | |
tree | f1505cff8d85ad454a021b97e9917c04f368e59e /MAINTAINERS | |
parent | 2a171788ba7bb61995e98e8163204fc7880f63b2 (diff) | |
parent | e226fb5affccca98c405de80527180224d93d251 (diff) | |
download | linux-6e300769dcbaba7bfacbc02ec9c3fcc595eec755.tar.xz |
Merge tag 'wireless-drivers-next-for-davem-2017-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.15
Mostly fixes this time, but also few new features.
Major changes:
wil6210
* remove ssid debugfs file
rsi
* add WOWLAN support for suspend, hibernate and shutdown states
ath10k
* add support for CCMP-256, GCMP and GCMP-256 ciphers on hardware
where it's supported (QCA99x0 and QCA4019)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d20c9a483c42..9729ebe4eb12 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14569,7 +14569,6 @@ L: wil6210@qca.qualcomm.com S: Supported W: http://wireless.kernel.org/en/users/Drivers/wil6210 F: drivers/net/wireless/ath/wil6210/ -F: include/uapi/linux/wil6210_uapi.h WIMAX STACK M: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> |