From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 14 May 2014 19:39:45 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.15-rc7~8^2~23^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eac94da8b4cc3dd4336ed434fbc2370c3c850003;p=thirdparty%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
---

eac94da8b4cc3dd4336ed434fbc2370c3c850003