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-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=985f2c87a7109a42cac93f56ea595353d53a1746;p=openwrt%2Fstaging%2Fblogic.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