From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 18 Jul 2014 16:55:45 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.16~18^2~11^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fc942722209208241b7e676e80b5e8a3efd2960;p=thirdparty%2Flinux.git

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

7fc942722209208241b7e676e80b5e8a3efd2960