Merge tag 'mac80211-next-for-davem-2016-06-09' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:13:32 +0000 (23:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:13:32 +0000 (23:13 -0700)
commitd6cf3a85b47424d6fc7b57129680097067cf95eb
tree9c122d64c1f038bbfe4d9d7687b4bb3115ce5147
parent52a3d792bb54d379c4546cbc40c1365139922e15
parent5caa328e3811b7cfa33fd02c93280ffa622deb0e
Merge tag 'mac80211-next-for-davem-2016-06-09' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
For the next cycle, we have the following:
 * the biggest change is MichaƂ's work on integrating FQ/codel
   with the mac80211 internal software queues
 * cfg80211 connect result gets clarified for the
   "no connection at all" case
 * advertisement of per-interface type capabilities, in case
   they differ (which makes a lot of sense for some capabilities)
 * most of the nl80211 & hwsim unprivileged namespace operation
   changes
 * human-readable VHT capabilities in debugfs
 * some other cleanups, like spelling
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireless/mac80211_hwsim.c
net/wireless/core.c