From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 20 Oct 2014 14:41:33 +0000 (+0200)
Subject: Merge branch 'mac80211' into mac80211-next
X-Git-Tag: firefly_0821_release~176^2~2717^2~28^2~15^2~110
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8fa74e3aa6398ffef3c52147c969c0f5f0a1244e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mac80211' into mac80211-next

This was needed to avoid conflicts in the minstrel changes.

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

8fa74e3aa6398ffef3c52147c969c0f5f0a1244e