From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 14 Apr 2014 17:47:01 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.15-rc2~9^2~1^2^2~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=08e22e193a0080d53dd0669c4f6422f602bb643c;p=~emulex%2Finfiniband.git

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

08e22e193a0080d53dd0669c4f6422f602bb643c