From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 22 May 2014 18:01:43 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.16-rc1~27^2~122^2^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b88bb291b21f364c5441bdbf8195502bc75e6b47;p=thirdparty%2Fkernel%2Fstable.git

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

b88bb291b21f364c5441bdbf8195502bc75e6b47