From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 4 Sep 2014 17:45:56 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.18-rc1~52^2~133^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d17ec4d55223d9487df195012762da6f85862d4c;p=~emulex%2Finfiniband.git

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

d17ec4d55223d9487df195012762da6f85862d4c