From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 20 Jan 2015 07:11:39 +0000 (+0200)
Subject: Merge tag 'tags/mac80211-next-for-davem-2015-01-19' into iwlwifi-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7fe3016f24296ec88100113c9671fa605a71c44e;p=linux-beck.git

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
---

7fe3016f24296ec88100113c9671fa605a71c44e