From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 21 Nov 2011 21:00:56 +0000 (-0500)
Subject: Merge branch 'for-linville' of git://github.com/sgruszka/iwlegacy
X-Git-Tag: firefly_0821_release~3680^2~3834^2~44^2~385
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4713e962c5d98901890c446843ae4e0a9d37b7b3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linville' of git://github.com/sgruszka/iwlegacy
---

4713e962c5d98901890c446843ae4e0a9d37b7b3