From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Jul 2013 18:46:51 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.11-rc4~5^2~27^2^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=161915a07d501404710f5c89f9c98e6b58c085f0;p=linux.git

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

161915a07d501404710f5c89f9c98e6b58c085f0