diff options
author | David S. Miller <davem@davemloft.net> | 2018-02-22 15:18:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-02-22 15:18:28 -0500 |
commit | 60772e48ec417c5455ff04454b94fd68466f2c73 (patch) | |
tree | 7b80f73766fe73a7a03f3972144413efaeb87c2a /include/acpi/acoutput.h | |
parent | 82e3be320d1e38a5e91a79d0eb451954c87ab7fe (diff) | |
parent | 94ba92713f8329c96e0a8e2880b3c1a785d1c95c (diff) | |
download | linux-60772e48ec417c5455ff04454b94fd68466f2c73.tar.bz2 |
Merge tag 'mac80211-next-for-davem-2018-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Various updates across wireless.
One thing to note: I've included a new ethertype
that wireless uses (ETH_P_PREAUTH) in if_ether.h.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/acpi/acoutput.h')
0 files changed, 0 insertions, 0 deletions