From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Mon, 5 Mar 2012 17:32:58 +0000 (+0200)
Subject: Merge remote branch 'wireless-next/master' into ath6kl-next
X-Git-Tag: v3.4-rc1~177^2~48^2~55^2~23
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=05e5bd0f3daddb0368a433af5b58be68c62dc365;p=linux-2.6-block.git

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

Conflicts:
	drivers/net/wireless/ath/ath6kl/cfg80211.c
---

05e5bd0f3daddb0368a433af5b58be68c62dc365