]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4ff757bab521cc65c51fd207ddff44ef0d0bcdfd
tree4bbd64f6671391d6d93c1a1806ffec005114524e
parenta65902a7231f1bd58341a1d1a832431920942949
parent43a93a309cf8935aaf231ab8d7f33fbe549e754c
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
net/mac80211/tx.c