From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 18 Oct 2013 17:35:39 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.13-rc1~105^2~55^2^2^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=334300f247abc4f21124ff3ac192df5222ea79bf;p=thirdparty%2Fkernel%2Flinux.git

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

334300f247abc4f21124ff3ac192df5222ea79bf