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

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>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
Simple merge