From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 3 Apr 2013 18:19:48 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.9-rc7~26^2~11^2^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9306a398e76df1952685e95cc293c4100fe5286d;p=thirdparty%2Fkernel%2Flinux.git

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

9306a398e76df1952685e95cc293c4100fe5286d