]> asedeno.scripts.mit.edu Git - linux.git/commit
projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit753d179ad001b25425beb977d00f2531540e7d42
treede61b9e3c86b71e9a654cea002b188f90b1f8ef6tree | snapshot
parent503c1fb98ba3859c13863957c7c65c92371a9e50commit | diff
parentcc71b7b071192ac1c288e272fdc3f3877eb96663commit | diff
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>
net/wireless/nl80211.c diff1 | diff2 | blob | history
local clone of linux.git