From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 25 Feb 2011 20:14:33 +0000 (-0500)
Subject: Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: upstream/snapshot3+hdmi~11215^2~16^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79ae79c9aa496309ecc96a2c00b5427735dd3370;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

79ae79c9aa496309ecc96a2c00b5427735dd3370