]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 23 May 2018 09:05:26 +0000 (11:05 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 23 May 2018 09:05:59 +0000 (11:05 +0200)
commitf6fb7faf81b97bf2f705fd3e58add19dc50ddb9b
treecce17d4b8eb8987194beb40498c8f83e74d6799f
parentaa0e63f5c1883821e261a85aa3940287c26de1a3
parent7e5fd470c87d287cac2422bb00f9dd3bf12b5950
Merge remote-tracking branch 'net-next/master' into mac80211-next

Bring in net-next which had pulled in net, so I have the changes
from mac80211 and can apply a patch that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c
include/net/mac80211.h
include/uapi/linux/nl80211.h
net/mac80211/tx.c
net/wireless/nl80211.c
net/wireless/reg.c