]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 503c1fb cc71b7b)
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 6 Oct 2017 09:46:32 +0000 (11:46 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 6 Oct 2017 09:46:55 +0000 (11:46 +0200)
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>
1  2 
net/wireless/nl80211.c patch | diff1 | diff2 | blob | history

diff --cc net/wireless/nl80211.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.