summaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-12-07 14:10:10 -0500
committerDavid S. Miller <davem@davemloft.net>2015-12-07 14:10:10 -0500
commitad9360b3e5d428d859256390906dff64f2ddc290 (patch)
treebb4efb4a39034bd657f405f4e2583acfc1557bdc /net/dsa
parent4c9668dfe1b410e78a40f8815ea7c50d0f71e1ac (diff)
parent1b894521e60c1b91db1e8ba1278660e5c89f1b5f (diff)
downloadlinux-ad9360b3e5d428d859256390906dff64f2ddc290.tar.bz2
Merge tag 'mac80211-next-for-davem-2015-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== This pull request got a bit bigger than I wanted, due to needing to reshuffle and fix some bugs. I merged mac80211 to get the right base for some of these changes. * new mac80211 API for upcoming driver changes: EOSP handling, key iteration * scan abort changes allowing to cancel an ongoing scan * VHT IBSS 80+80 MHz support * re-enable full AP client state tracking after fixes * various small fixes (that weren't relevant for mac80211) * various cleanups ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
0 files changed, 0 insertions, 0 deletions