]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'mac80211-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:02:59 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:02:59 +0000 (13:02 +1000)
1  2 
net/mac80211/mlme.c
net/mac80211/tx.c
net/wireless/nl80211.c
net/wireless/scan.c

Simple merge
Simple merge
Simple merge
Simple merge