From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 19 Oct 2012 19:36:53 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.8-rc1~139^2~337^2^2~104
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3cd17638fdf13d2f7fe76465cf74106e612af5eb;p=~emulex%2Finfiniband.git

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

3cd17638fdf13d2f7fe76465cf74106e612af5eb