From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 25 Jun 2014 18:17:50 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=12307e420864eb99a648dae84dd3888959885d97;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./linux/kernel/git/jberg/mac80211
---

12307e420864eb99a648dae84dd3888959885d97