From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 5 Oct 2010 15:14:58 +0000 (-0400)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.37-rc1~147^2~191^2^2~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1a9338d5eaa9c38c326e20ce339247f4d585b62;p=thirdparty%2Flinux.git

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

b1a9338d5eaa9c38c326e20ce339247f4d585b62