From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 28 Feb 2011 19:05:38 +0000 (-0500)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~3988^2~158^2^2~18
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f54b92b9272cde9720b1371937928e92c5b29fb4;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
---

f54b92b9272cde9720b1371937928e92c5b29fb4