| commit | 7d6aa9ba4f8228c75970fc4fad27194611a548a6 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Thu Jan 02 14:50:09 2020 +0100 |
| committer | Johannes Berg <johannes.berg@intel.com> | Thu Jan 02 14:50:58 2020 +0100 |
| tree | 4bbd64f6671391d6d93c1a1806ffec005114524e | |
| parent | 1ee7826ab68f7e9fa1a01533983acf6a6f62e297 [diff] | |
| parent | fe23d63422c83cd7c8154dc7faef6af97be4b948 [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>