From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Mon, 21 Nov 2011 15:02:46 +0000 (+0200)
Subject: Merge remote branch 'wireless-next/master' into ath6kl-next
X-Git-Tag: v3.3-rc1~182^2~44^2~72^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a97af7eb68c9405152ae5796d5307fca2acdef1;p=thirdparty%2Flinux.git

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

9a97af7eb68c9405152ae5796d5307fca2acdef1