From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 12 Feb 2014 20:24:14 +0000 (-0500)
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~289^2^2~101
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=841577c3d33b8a2bff66d1b506d8198b25900bde;p=~emulex%2Finfiniband.git

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

841577c3d33b8a2bff66d1b506d8198b25900bde