From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 2 Dec 2013 17:57:23 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif... 
X-Git-Tag: v3.13-rc4~3^2~64^2^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=041b499bb1b88512b96b411a1695a86f32ee55d5;p=thirdparty%2Fkernel%2Fstable.git

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

041b499bb1b88512b96b411a1695a86f32ee55d5