From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 7 Sep 2012 18:49:46 +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~163^2^2~86
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4a3e12fd7a106bdf092704ea10ff463d2309213a;p=linux.git

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

4a3e12fd7a106bdf092704ea10ff463d2309213a