From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 7 Jan 2015 13:39:02 +0000 (+0100)
Subject: Merge branch 'mac80211' into mac80211-next
X-Git-Tag: firefly_0821_release~176^2~2371^2~69^2~56
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3a4b0c948d286523ba062985c03487b55326eaae;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mac80211' into mac80211-next

Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

3a4b0c948d286523ba062985c03487b55326eaae