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: v4.4-rc1~141^2~85^2~28
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/985f2c87a7109a42cac93f56ea595353d53a1746

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