From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 23 Jan 2014 19:00:51 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.14-rc1~94^2~3^2^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfa9c3fba738031ae107039ed7da0819f2c02502;p=thirdparty%2Fkernel%2Flinux.git

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

cfa9c3fba738031ae107039ed7da0819f2c02502