From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 28 Sep 2010 20:01:47 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.37-rc1~147^2~265^2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1728943d83e9fd919e454332fe344944123b3c3a;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-lib.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
---

1728943d83e9fd919e454332fe344944123b3c3a