Merge branch 'for-linville' of git://github.com/kvalo/ath6kl

author John W. Linville <linville@tuxdriver.com>

Fri, 15 Feb 2013 19:06:32 +0000 (14:06 -0500)

committer John W. Linville <linville@tuxdriver.com>

Fri, 15 Feb 2013 19:06:32 +0000 (14:06 -0500)
author John W. Linville <linville@tuxdriver.com>
Fri, 15 Feb 2013 19:06:32 +0000 (14:06 -0500)
committer John W. Linville <linville@tuxdriver.com>
Fri, 15 Feb 2013 19:06:32 +0000 (14:06 -0500)
diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c
Simple merge
diff --cc drivers/net/wireless/ath/ath6kl/wmi.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Fri, 15 Feb 2013 19:06:32 +0000 (14:06 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 15 Feb 2013 19:06:32 +0000 (14:06 -0500)
		1	2
drivers/net/wireless/ath/ath6kl/cfg80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/wmi.c	patch \|	diff1 \|	diff2 \|	blob \| history