From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 10 Mar 2010 21:34:38 +0000 (-0500)
Subject: Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v2.6.34-rc5~5^2~3^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dee60269f0fe90927ce5095eef3a8723bbb9c53e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'wireless-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6
---

dee60269f0fe90927ce5095eef3a8723bbb9c53e