diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-30 21:08:12 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-30 21:08:12 +0900 |
| commit | 8365da2c0570f02615e7f1d2d729d854029202b0 (patch) | |
| tree | 223ab9641411c401269e5da80f260cafaf40eedc /MAINTAINERS | |
| parent | a1be5a20f137bdf436bab86c18998229908ce951 (diff) | |
| parent | a4217750586975dee7d6dd8829a1be24a7678b3d (diff) | |
| download | linux-stable-8365da2c0570f02615e7f1d2d729d854029202b0.tar.gz linux-stable-8365da2c0570f02615e7f1d2d729d854029202b0.tar.bz2 linux-stable-8365da2c0570f02615e7f1d2d729d854029202b0.zip | |
Merge tag 'mac80211-next-for-davem-2018-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Small merge conflict in net/mac80211/scan.c, I preserved
the kcalloc() conversion. -DaveM
Johannes Berg says:
====================
This round's updates:
* finally some of the promised HE code, but it turns
out to be small - but everything kept changing, so
one part I did in the driver was >30 patches for
what was ultimately <200 lines of code ... similar
here for this code.
* improved scan privacy support - can now specify scan
flags for randomizing the sequence number as well as
reducing the probe request element content
* rfkill cleanups
* a timekeeping cleanup from Arnd
* various other cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f3e766e504d8..3b2e592aa521 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12156,6 +12156,8 @@ S: Maintained F: Documentation/rfkill.txt F: Documentation/ABI/stable/sysfs-class-rfkill F: net/rfkill/ +F: include/linux/rfkill.h +F: include/uapi/linux/rfkill.h RHASHTABLE M: Thomas Graf <tgraf@suug.ch> |