From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 12 May 2014 18:12:19 +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~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5e64d6b70da16979652053e04f794f6d7863282;p=thirdparty%2Fkernel%2Flinux.git

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

c5e64d6b70da16979652053e04f794f6d7863282