From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 8 Apr 2010 17:34:54 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.35-rc1~473^2~460^2^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f2df9eac70423838a1f8d410fd3899ddd88317b;p=pandora-kernel.git

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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
---

0f2df9eac70423838a1f8d410fd3899ddd88317b
Reading git-diff-tree failed