wireless-testing 2015-05-26
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Conflicts:
	drivers/net/wireless/ath/ath10k/mac.c