From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 4 Apr 2011 20:10:36 +0000 (-0400)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0-rc2~7^2~16^2~578
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18d6a0f5b6693d630a8da9dfd6cac1ea4e5dccab;p=thirdparty%2Fkernel%2Fstable.git

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

18d6a0f5b6693d630a8da9dfd6cac1ea4e5dccab