From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 12 Jun 2013 18:26:48 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.10~13^2~34^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6bb7aabf73401c9cfca26c71ccae1e3d6e1640d5;p=~emulex%2Finfiniband.git

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

6bb7aabf73401c9cfca26c71ccae1e3d6e1640d5