aboutsummaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-10-22 07:28:41 -0700
committerDavid S. Miller <davem@davemloft.net>2015-10-22 07:28:41 -0700
commite9829b9745b6e1683fd2a90842da498a2197299e (patch)
tree088466771298ed5d92b1b1b30a52204d37c2f4ff /net/dsa
parentnet: hisilicon: deals with the sub ctrl by syscon (diff)
parentmac80211: move station statistics into sub-structs (diff)
downloadlinux-dev-e9829b9745b6e1683fd2a90842da498a2197299e.tar.xz
linux-dev-e9829b9745b6e1683fd2a90842da498a2197299e.zip
Merge tag 'mac80211-next-for-davem-2015-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== Here's another set of patches for the current cycle: * I merged net-next back to avoid a conflict with the * cfg80211 scheduled scan API extensions * preparations for better scan result timestamping * regulatory cleanups * mac80211 statistics cleanups * a few other small cleanups and fixes ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
0 files changed, 0 insertions, 0 deletions