From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Fri, 16 Dec 2011 19:10:39 +0000 (+0200)
Subject: Merge remote branch 'wireless-next/master' into ath6kl-next
X-Git-Tag: v3.3-rc1~182^2~44^2~72^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e95e365d5399647a41e10059e4b09826b82d78b;p=pandora-kernel.git

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

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

7e95e365d5399647a41e10059e4b09826b82d78b
Reading git-diff-tree failed