summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_user.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-10-30 12:38:24 +0100
committerDavid S. Miller <davem@davemloft.net>2015-10-30 12:38:24 +0100
commita493bcf8d6caf28f062c5f8f2ba486fdbf1ae899 (patch)
tree66d31fa2f1296caee8f46ea019d032c1bac3b111 /net/xfrm/xfrm_user.c
parentswitchdev: fix: pass correct obj size when deferring obj add (diff)
parentMerge ath-next from ath.git (diff)
downloadlinux-a493bcf8d6caf28f062c5f8f2ba486fdbf1ae899.tar.xz
linux-a493bcf8d6caf28f062c5f8f2ba486fdbf1ae899.zip
Merge tag 'wireless-drivers-next-for-davem-2015-10-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says: ==================== iwlwifi * bug fix for TDLS * fixes and cleanups in scan * support of several scan plans * improvements in FTM * fixes in FW API * improvements in the failure paths when the bus is dead * other various small things here and there ath10k * add QCA9377 support * fw_stats support for 10.4 firmware ath6kl * report antenna configuration to user space * implement ethtool stats ssb * add Kconfig SSB_HOST_SOC for compiling SoC related code * move functions specific to SoC hosted bus to separated file * pick PCMCIA host code support from b43 driver ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_user.c')
0 files changed, 0 insertions, 0 deletions