From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 22 Jun 2012 17:56:34 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.5-rc6~18^2~5^2^2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8d6fcbdb4e039544e3f60a909a0cd819f3f68ad9;p=linux.git

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

8d6fcbdb4e039544e3f60a909a0cd819f3f68ad9