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: master-2012-03-13~15^2~23
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=05e5bd0f3daddb0368a433af5b58be68c62dc365;p=~andy%2Flinux

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

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

05e5bd0f3daddb0368a433af5b58be68c62dc365