From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 29 May 2013 19:56:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=774439518ac01049e9bf44f2fa4c604981f39dbf;p=openwrt%2Fstaging%2Fblogic.git

Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
---

774439518ac01049e9bf44f2fa4c604981f39dbf