From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 6 Oct 2017 09:46:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next
X-Git-Tag: v4.15-rc1~84^2~490^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=753d179ad001b25425beb977d00f2531540e7d42;p=linux.git

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

Merging this brings in the timer_setup() change, which allows
me to apply Kees's mac80211 changes for it.

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

753d179ad001b25425beb977d00f2531540e7d42