projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5207ca5 abf1a08)
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 8 Oct 2018 07:48:31 +0000 (09:48 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 8 Oct 2018 07:48:36 +0000 (09:48 +0200)
Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1  2 
include/net/cfg80211.h patch | diff1 | diff2 | blob | history
net/wireless/nl80211.c patch | diff1 | diff2 | blob | history
net/wireless/reg.c patch | diff1 | diff2 | blob | history

diff --cc include/net/cfg80211.h
Simple merge
diff --cc net/wireless/nl80211.c
Simple merge
diff --cc net/wireless/reg.c
Simple merge
Domain: System / Kernel;