Merge tag 'mac80211-next-for-davem-2015-10-21' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 Oct 2015 14:28:41 +0000 (07:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Oct 2015 14:28:41 +0000 (07:28 -0700)
commite9829b9745b6e1683fd2a90842da498a2197299e
tree088466771298ed5d92b1b1b30a52204d37c2f4ff
parentc7fc9eb79a89049214f9870a6cf978050aaea43a
parente5a9f8d04660da7ef3a98260aa74c3976f9cb4cd
Merge tag 'mac80211-next-for-davem-2015-10-21' of git://git./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>
drivers/net/wireless/iwlwifi/mvm/ops.c
net/mac80211/status.c
net/mac80211/tx.c