From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 28 Aug 2013 17:49:20 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.12-rc1~132^2~84^2^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc;p=linux.git

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

cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc