From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 12 Feb 2014 20:21:07 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
X-Git-Tag: firefly_0821_release~176^2~4167^2~18^2^2~371
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e9c653167710e5624c5576ee7d657c6b86878caf;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/iwlwifi/iwlwifi-next
---

e9c653167710e5624c5576ee7d657c6b86878caf