From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 20 Feb 2014 20:37:15 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.14-rc6~30^2~20^2^2~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d421c62e37c9c83496fa721d4f4cd4a6cae82151;p=linux.git

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
---

d421c62e37c9c83496fa721d4f4cd4a6cae82151