From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 3 Feb 2011 21:35:20 +0000 (-0500)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.39-rc1~468^2~403^2~62
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dbd98308a5dc6bc7e8e79ca8b7a0038638d24605;p=users%2Fjedix%2Flinux-maple.git

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

dbd98308a5dc6bc7e8e79ca8b7a0038638d24605