From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 10 Oct 2013 17:38:50 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.13-rc1~105^2~181^2^2~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e9517fecf2ec6497fccb2c14ea0c014bda8b113a;p=users%2Fwilly%2Flinux.git

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

e9517fecf2ec6497fccb2c14ea0c014bda8b113a