From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 Apr 2013 18:58:14 +0000 (-0400)
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~43^2^2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6475cb05ee17870c7c8d44146dbe09044e6db33d;p=thirdparty%2Fkernel%2Flinux.git

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

6475cb05ee17870c7c8d44146dbe09044e6db33d