From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 8 Oct 2018 07:48:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next
X-Git-Tag: for-linus-20181026~43^2~107^2~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=188de5dd80b2b7986e75821374efb67081049b6e;p=linux-block.git

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

Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.

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

188de5dd80b2b7986e75821374efb67081049b6e