From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 8 Mar 2013 20:52:21 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.10-rc1~120^2~390^2^2~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d5c203272b25c4391397247cdb0059a04fccddf;p=thirdparty%2Flinux.git

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

3d5c203272b25c4391397247cdb0059a04fccddf