From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 17 Jul 2012 19:07:31 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.6-rc1~125^2~57^2~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=707be0ae13f7a4533d11f0d88687223c4bd8f85f;p=thirdparty%2Fkernel%2Flinux.git

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

707be0ae13f7a4533d11f0d88687223c4bd8f85f