From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 6 Mar 2013 15:33:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'mac80211/master' into HEAD
X-Git-Tag: firefly_0821_release~3680^2~478^2~21^2^2~117^2~105
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c0f3a317f2f0e51ad2f8809c83b137958b385c7f;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'mac80211/master' into HEAD

There are a few things that would otherwise conflict.

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

c0f3a317f2f0e51ad2f8809c83b137958b385c7f