Merge remote branch 'wireless-next/master' into ath6kl-next

author Kalle Valo <[email protected]>

Fri, 13 Jan 2012 11:57:45 +0000 (13:57 +0200)

committer Kalle Valo <[email protected]>

Fri, 13 Jan 2012 11:57:45 +0000 (13:57 +0200)
author Kalle Valo <[email protected]>
Fri, 13 Jan 2012 11:57:45 +0000 (13:57 +0200)
committer Kalle Valo <[email protected]>
Fri, 13 Jan 2012 11:57:45 +0000 (13:57 +0200)
diff --cc drivers/net/wireless/ath/ath6kl/htc.c
Simple merge
diff --cc drivers/net/wireless/ath/ath6kl/init.c
Simple merge
diff --cc drivers/net/wireless/ath/ath6kl/sdio.c
Simple merge
author	Kalle Valo <[email protected]>
	Fri, 13 Jan 2012 11:57:45 +0000 (13:57 +0200)
committer	Kalle Valo <[email protected]>
	Fri, 13 Jan 2012 11:57:45 +0000 (13:57 +0200)
		1	2
drivers/net/wireless/ath/ath6kl/htc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/sdio.c	patch \|	diff1 \|	diff2 \|	blob \| history