From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 2 Dec 2013 18:20:03 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.13-rc4~3^2~64^2^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a59b40b30f3f51bf5c56c15a7dc4da11b424a34b;p=people%2Fpauldu%2Flinux.git

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

a59b40b30f3f51bf5c56c15a7dc4da11b424a34b