Merge "nl80211: Use different attrs for BSSID and random MAC addr in scan req"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 21 Dec 2016 23:48:04 +0000 (15:48 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Wed, 21 Dec 2016 23:48:04 +0000 (15:48 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 21 Dec 2016 23:48:04 +0000 (15:48 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 21 Dec 2016 23:48:04 +0000 (15:48 -0800)
diff --cc include/uapi/linux/nl80211.h
Simple merge
diff --cc net/wireless/nl80211.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 21 Dec 2016 23:48:04 +0000 (15:48 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 21 Dec 2016 23:48:04 +0000 (15:48 -0800)
		1	2
include/uapi/linux/nl80211.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	patch \|	diff1 \|	diff2 \|	blob \| history