From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 Jul 2013 20:02:10 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.11-rc4~22^2~25^2^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0597a7a130533eae2e357373a487ebcc6dd01d34;p=thirdparty%2Fkernel%2Flinux.git

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

0597a7a130533eae2e357373a487ebcc6dd01d34