From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 18 Jun 2013 18:43:50 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.11-rc1~64^2~166^2^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b21eb9ad7712f6ad5a2b522c886e8f7f6fd867d;p=thirdparty%2Fkernel%2Flinux.git

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

0b21eb9ad7712f6ad5a2b522c886e8f7f6fd867d