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: Ubuntu-snapdragon-4.4.0-1050.54~15853^2~261^2~184
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4713e962c5d98901890c446843ae4e0a9d37b7b3;p=mirror_ubuntu-artful-kernel.git

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

4713e962c5d98901890c446843ae4e0a9d37b7b3