projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1ee7826 fe23d63)
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 2 Jan 2020 13:50:09 +0000 (14:50 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 2 Jan 2020 13:50:58 +0000 (14:50 +0100)
commit7d6aa9ba4f8228c75970fc4fad27194611a548a6
tree4bbd64f6671391d6d93c1a1806ffec005114524etree | snapshot
parent1ee7826ab68f7e9fa1a01533983acf6a6f62e297commit | diff
parentfe23d63422c83cd7c8154dc7faef6af97be4b948commit | diff
Merge remote-tracking branch 'net-next/master' into mac80211-next

Merging to get the mac80211 updates that have since propagated
into net-next.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/debugfs_sta.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
Domain: System / Kernel;