| commit | 752cfee90d11e280d727617bf8d6df894141e157 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Fri Feb 01 11:05:27 2019 +0100 |
| committer | Johannes Berg <johannes.berg@intel.com> | Fri Feb 01 11:05:35 2019 +0100 |
| tree | c55feff5c93af364fe2212d6b2942abb3748e05c | |
| parent | 5ac4a12df58121f0cf874b518406ec2a8e2d4ac4 [diff] | |
| parent | fa6821cbf1d9724284ef0906c9a01a5fbf13a35c [diff] |
Merge remote-tracking branch 'net-next/master' into mac80211-next Merge net-next so that we get the changes from net, which would otherwise conflict with the NLA_POLICY_NESTED/_ARRAY changes. Signed-off-by: Johannes Berg <johannes.berg@intel.com>