From: David S. Miller <davem@davemloft.net>
Date: Tue, 23 Mar 2010 01:15:15 +0000 (-0700)
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~714
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33e2bf6aa16061bae1253514e7c32af27d2b4b31;p=pandora-kernel.git

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

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

33e2bf6aa16061bae1253514e7c32af27d2b4b31
Reading git-diff-tree failed