From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 23 Jul 2014 17:06:17 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.17-rc1~106^2~73^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d878b3af675da14917a249e33addb789d54d3094;p=thirdparty%2Fkernel%2Flinux.git

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

d878b3af675da14917a249e33addb789d54d3094