Merge tag 'tags/mac80211-next-for-davem-2015-01-19' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 20 Jan 2015 07:11:39 +0000 (09:11 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 22 Jan 2015 15:54:10 +0000 (17:54 +0200)
commit7fe3016f24296ec88100113c9671fa605a71c44e
treeaac88623447c95badc6b0ffa1874b6b6b05ad616
parent57d7b6a4cda5a5247ab3b98a16a020af8e4f03fa
parentc1e140bf79d817d4a7aa9932eb98b0359c87af33
Merge tag 'tags/mac80211-next-for-davem-2015-01-19' into iwlwifi-next

Some further updates for net-next:
 * fix network-manager which was broken by the previous changes
 * fix delete-station events, which were broken by me making the
   genlmsg_end() mistake
 * fix a timer left running during suspend in some race conditions
   that would cause an annoying (but harmless) warning
 * (less important, but in the tree already) remove 80+80 MHz rate
   reporting since the spec doesn't distinguish it from 160 MHz;
   as the bitrate they're both 160 MHz bandwidth
drivers/net/wireless/iwlwifi/mvm/mac80211.c