From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 5 Sep 2012 14:17:42 +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=188ce5abebf56ec732f652abe608b94c317e4963;p=openwrt%2Fstaging%2Fblogic.git

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

188ce5abebf56ec732f652abe608b94c317e4963