Merge "wil6210: added sysfs file for FTM calibration"

author Linux Build Service Account <lnxbuild@localhost>

Tue, 21 Feb 2017 23:48:45 +0000 (15:48 -0800)

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

Tue, 21 Feb 2017 23:48:44 +0000 (15:48 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Tue, 21 Feb 2017 23:48:45 +0000 (15:48 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Tue, 21 Feb 2017 23:48:44 +0000 (15:48 -0800)
diff --cc drivers/net/wireless/ath/wil6210/pcie_bus.c
Simple merge
diff --cc drivers/net/wireless/ath/wil6210/wil6210.h
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Tue, 21 Feb 2017 23:48:45 +0000 (15:48 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Tue, 21 Feb 2017 23:48:44 +0000 (15:48 -0800)
		1	2
drivers/net/wireless/ath/wil6210/pcie_bus.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/wil6210/wil6210.h	patch \|	diff1 \|	diff2 \|	blob \| history