From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 8 May 2014 15:28:35 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif... 
X-Git-Tag: v3.15-rc7~8^2~23^2^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2e5cb4e22080578f5d7e66824f85cf0e11d65e4;p=thirdparty%2Fkernel%2Flinux.git

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

d2e5cb4e22080578f5d7e66824f85cf0e11d65e4