Merge ath-current from ath.git

author Kalle Valo <[email protected]>

Tue, 17 Nov 2015 13:56:52 +0000 (15:56 +0200)

committer Kalle Valo <[email protected]>

Tue, 17 Nov 2015 13:56:52 +0000 (15:56 +0200)
author Kalle Valo <[email protected]>
Tue, 17 Nov 2015 13:56:52 +0000 (15:56 +0200)
committer Kalle Valo <[email protected]>
Tue, 17 Nov 2015 13:56:52 +0000 (15:56 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/ath/ath10k/core.h
Simple merge
author	Kalle Valo <[email protected]>
	Tue, 17 Nov 2015 13:56:52 +0000 (15:56 +0200)
committer	Kalle Valo <[email protected]>
	Tue, 17 Nov 2015 13:56:52 +0000 (15:56 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/core.h	patch \|	diff1 \|	diff2 \|	blob \| history