From: Johannes Berg Date: Fri, 6 Oct 2017 09:46:32 +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=753d179ad001b25425beb977d00f2531540e7d42;p=openwrt%2Fstaging%2Fblogic.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 --- 753d179ad001b25425beb977d00f2531540e7d42