Merge "cnss2: Add support for genoa sdio"

author Linux Build Service Account <lnxbuild@localhost>

Mon, 14 Oct 2019 11:48:43 +0000 (04:48 -0700)

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

Mon, 14 Oct 2019 11:48:42 +0000 (04:48 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Mon, 14 Oct 2019 11:48:43 +0000 (04:48 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Mon, 14 Oct 2019 11:48:42 +0000 (04:48 -0700)
diff --cc drivers/net/wireless/cnss2/main.c
Simple merge
diff --cc drivers/net/wireless/cnss2/main.h
Simple merge
diff --cc include/net/cnss2.h
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Mon, 14 Oct 2019 11:48:43 +0000 (04:48 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Mon, 14 Oct 2019 11:48:42 +0000 (04:48 -0700)
		1	2
drivers/net/wireless/cnss2/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/cnss2/main.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/net/cnss2.h	patch \|	diff1 \|	diff2 \|	blob \| history