From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 4 Jan 2011 19:26:34 +0000 (-0500)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.38-rc1~476^2~14^2~3^2~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0511af9e9a43c64dd7e23e642c9087710688768c;p=thirdparty%2Fkernel%2Flinux.git

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

0511af9e9a43c64dd7e23e642c9087710688768c