From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 6 Dec 2010 20:52:27 +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~169^2^2~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f79ed3b1aa7af260c82ba714b90907070aeca7a;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
---

5f79ed3b1aa7af260c82ba714b90907070aeca7a