From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 4 Feb 2014 20:14:34 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.14-rc4~30^2~5^2^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=235c0dc55aa52157bbaf2917e0a4bd8ae965c43a;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

235c0dc55aa52157bbaf2917e0a4bd8ae965c43a