From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Oct 2012 18:52:04 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.8-rc1~139^2~337^2^2~68
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d1f10302568221c20628200bc8baa426c55f61c0;p=linux.git

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

d1f10302568221c20628200bc8baa426c55f61c0