From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 6 May 2014 18:05:51 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.15-rc7~8^2~47^2^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cabae81103584a8265114a543555781b7b0c88bd;p=linux.git

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

cabae81103584a8265114a543555781b7b0c88bd