From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 17 Oct 2012 20:23:33 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.7-rc3~7^2^2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=290eddc4b3661dc4dfa95d199e0be5788928b3b1;p=~emulex%2Finfiniband.git

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

290eddc4b3661dc4dfa95d199e0be5788928b3b1