From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 29 May 2014 16:55:38 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
X-Git-Tag: v3.16-rc1~27^2~99^2^2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=737be10d8cb783d1cadb1868b061abb2b4314eae;p=thirdparty%2Flinux.git

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

737be10d8cb783d1cadb1868b061abb2b4314eae