]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9a7fd5c ad4995c)
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)
commitb749a8102c0e19eed7ff9224c96a43121847b5c3
treede61b9e3c86b71e9a654cea002b188f90b1f8ef6tree | snapshot
parent9a7fd5c2e19f9933ae5dec45b1be5ca16a7d7f97commit | diff
parentad4995ce9e687bf26759dd4d1423b963aa885eebcommit | 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
Linux Kernel Source Tree.