From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 13 Oct 2015 08:28:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next
X-Git-Tag: firefly_0821_release~176^2~818^2~85^2~28
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=985f2c87a7109a42cac93f56ea595353d53a1746;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next to get some driver changes that patches depend
on (in order to avoid conflicts).

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

985f2c87a7109a42cac93f56ea595353d53a1746