From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 25 Sep 2012 19:54:32 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.7-rc1~145^2~31^2^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5419575e838cd2cd11a1b30449eb58decdf51f9f;p=thirdparty%2Fkernel%2Flinux.git

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

5419575e838cd2cd11a1b30449eb58decdf51f9f