From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 May 2014 18:16:17 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif... 
X-Git-Tag: firefly_0821_release~176^2~3540^2~11^2~7^2~88
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d91a48cbae4cc12f6e8a65372a73ecf46f8f1b7f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
---

d91a48cbae4cc12f6e8a65372a73ecf46f8f1b7f