From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 20 Mar 2014 15:53:20 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.15-rc1~113^2~93^2^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7eb2450a51ea7606fa69ae4bb2113e0f228223cc;p=linux.git

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

7eb2450a51ea7606fa69ae4bb2113e0f228223cc