summaryrefslogtreecommitdiff
path: root/security/apparmor/capability.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-07-03 05:51:45 -0700
committerDavid S. Miller <davem@davemloft.net>2017-07-03 05:51:45 -0700
commitbcdb9e8523bd46000648382ae3e53a00eecc502e (patch)
tree6372d970edc3abf92b87a206539e4400328aa54d /security/apparmor/capability.c
parent3a3f7d130eb5c219a1a4b183b92106028747dc85 (diff)
parent17d9aa66b08de445645bd0688fc1635bed77a57b (diff)
Merge tag 'wireless-drivers-next-for-davem-2017-07-03' of https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says: ==================== wireless-drivers-next patches for 4.13 Last minute changes to get new hardware and firmware support for iwlwifi and few other changes I was able to squeeze in. Also two patches for ieee80211.h and nl80211 as Johannes is away. Major changes: iwlwifi * some important fixes for 9000 HW * support for version 30 of the FW API for 8000 and 9000 series * a few new PCI IDs for 9000 series * reorganization of common files brcmfmac * support 4-way handshake offloading for WPA/WPA2-PSK and 802.1X ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/apparmor/capability.c')
0 files changed, 0 insertions, 0 deletions