From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 25 Mar 2013 18:50:17 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.9-rc6~38^2~18^2^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fae172136c0cfc80cb4b13620c861688e671650a;p=thirdparty%2Fkernel%2Flinux.git

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

fae172136c0cfc80cb4b13620c861688e671650a