From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Thu, 14 Jun 2012 11:20:18 +0000 (+0300)
Subject: Merge remote branch 'wireless-next/master' into ath6kl-next
X-Git-Tag: v3.6-rc1~125^2~57^2~287^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d987dd137bac8dca9b0015763d3106f48bb8a596;p=pandora-kernel.git

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

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

d987dd137bac8dca9b0015763d3106f48bb8a596
Reading git-diff-tree failed