From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 14 Nov 2012 19:15:43 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.7-rc6~3^2^2^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bd2a81307487eba486f200423330d2403d0b893b;p=users%2Fjedix%2Flinux-maple.git

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

bd2a81307487eba486f200423330d2403d0b893b