Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

author Kalle Valo <[email protected]>

Wed, 23 May 2018 07:42:08 +0000 (10:42 +0300)

committer Kalle Valo <[email protected]>

Wed, 23 May 2018 07:42:08 +0000 (10:42 +0300)
author Kalle Valo <[email protected]>
Wed, 23 May 2018 07:42:08 +0000 (10:42 +0300)
committer Kalle Valo <[email protected]>
Wed, 23 May 2018 07:42:08 +0000 (10:42 +0300)
diff --cc drivers/net/wireless/ath/wil6210/debugfs.c
Simple merge
diff --cc drivers/net/wireless/ath/wil6210/wmi.c
Simple merge
author	Kalle Valo <[email protected]>
	Wed, 23 May 2018 07:42:08 +0000 (10:42 +0300)
committer	Kalle Valo <[email protected]>
	Wed, 23 May 2018 07:42:08 +0000 (10:42 +0300)
		1	2
drivers/net/wireless/ath/wil6210/debugfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/wil6210/wmi.c	patch \|	diff1 \|	diff2 \|	blob \| history