From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 24 May 2013 22:01:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'mac80211/master' into mac80211-next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=dde7dc759b777f385fc5df2af691c82eb455c7f3;p=openwrt%2Fstaging%2Fblogic.git

Merge remote-tracking branch 'mac80211/master' into mac80211-next
---

dde7dc759b777f385fc5df2af691c82eb455c7f3