From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 17 Jul 2015 13:39:38 +0000 (+0200)
Subject: Merge branch 'mac80211' into mac80211-next
X-Git-Tag: firefly_0821_release~176^2~1159^2~155^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mac80211' into mac80211-next

This is necessary to merge the new TDLS and mesh patches,
as they depend on some fixes.

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

72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d