From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Fri, 13 Jan 2012 11:57:45 +0000 (+0200)
Subject: Merge remote branch 'wireless-next/master' into ath6kl-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9;p=openwrt%2Fstaging%2Fblogic.git

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

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

a0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9