Merge "cnss2: Provide sysfs control for vdd-wlan-en"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 13 Feb 2019 07:51:34 +0000 (23:51 -0800)

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

Wed, 13 Feb 2019 07:51:33 +0000 (23:51 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 13 Feb 2019 07:51:34 +0000 (23:51 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 13 Feb 2019 07:51:33 +0000 (23:51 -0800)
diff --cc drivers/net/wireless/cnss2/main.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 13 Feb 2019 07:51:34 +0000 (23:51 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 13 Feb 2019 07:51:33 +0000 (23:51 -0800)