]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 8 Oct 2018 07:48:31 +0000 (09:48 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 8 Oct 2018 07:48:36 +0000 (09:48 +0200)
commit03f9b1d5d27438fccd8f332b67fb7196acbb77dd
tree545bbc0fdb58f30c0175128e3b5a9c00c89e2020
parent38740cb0d46953d1b71d40630e702d9dd6f5f57d
parente544b89653a0710aee1fd2da0b8807af6e0626c4
Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
include/net/cfg80211.h
net/wireless/nl80211.c
net/wireless/reg.c