]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 1 Feb 2019 10:05:27 +0000 (11:05 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 1 Feb 2019 10:05:35 +0000 (11:05 +0100)
commitdd19ab029dec3d332f0e1583feba3513c7b6de5e
treec55feff5c93af364fe2212d6b2942abb3748e05c
parentb3e82b2de1ebb481ba9cb516f324972ff5d2cb8a
parent4afd40bda1e48b17df5257ed3d65e019c769d581
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>
drivers/net/wireless/virt_wifi.c
net/mac80211/cfg.c
net/wireless/nl80211.c
net/wireless/reg.c