From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 24 Jun 2013 18:44:59 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.11-rc1~64^2~78^2^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66ba271ab90424ba5a895662b6783c4837a96e0a;p=thirdparty%2Fkernel%2Flinux.git

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

66ba271ab90424ba5a895662b6783c4837a96e0a