diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2019-02-01 11:05:27 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-02-01 11:05:35 +0100 |
| commit | 752cfee90d11e280d727617bf8d6df894141e157 (patch) | |
| tree | c55feff5c93af364fe2212d6b2942abb3748e05c /net/tls/tls_device_fallback.c | |
| parent | cfg80211: fix typo (diff) | |
| parent | r8169: improve WoL handling (diff) | |
| download | linux-rng-752cfee90d11e280d727617bf8d6df894141e157.tar.xz linux-rng-752cfee90d11e280d727617bf8d6df894141e157.zip | |
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>
Diffstat (limited to 'net/tls/tls_device_fallback.c')
0 files changed, 0 insertions, 0 deletions