From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 15 Apr 2010 20:21:34 +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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c01d5669356e13f0fb468944c1dd4c6a7e978ad;p=pandora-kernel.git

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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/wl12xx/wl1271_main.c
---

5c01d5669356e13f0fb468944c1dd4c6a7e978ad
Reading git-diff-tree failed