From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 23 Aug 2012 13:49:42 +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~278^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4881cc45a3fab4488e16c4934e149cfa620f1a9;p=thirdparty%2Fkernel%2Flinux.git

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

a4881cc45a3fab4488e16c4934e149cfa620f1a9