From: David S. Miller <davem@davemloft.net>
Date: Fri, 16 Jan 2015 00:16:56 +0000 (-0500)
Subject: Merge tag 'mac80211-next-for-davem-2015-01-15' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.0-rc1~133^2~206
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=27f097177defdd5858f03500e4b5aa8a97b1627b

Merge tag 'mac80211-next-for-davem-2015-01-15' of git://git./linux/kernel/git/jberg/mac80211-next

Here's a big pile of changes for this round.

We have
 * a lot of regulatory code changes to deal with the
   way newer Intel devices handle this
 * a change to drop packets while disconnecting from
   an AP instead of trying to wait for them
 * a new attempt at improving the tailroom accounting
   to not kick in too much for performance reasons
 * improvements in wireless link statistics
 * many other small improvements and small fixes that
   didn't seem necessary for 3.19 (e.g. in hwsim which
   is testing only code)

Conflicts:
	drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c

Minor overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

27f097177defdd5858f03500e4b5aa8a97b1627b