From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 12 Apr 2011 20:18:44 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.0-rc1~377^2~437^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=252f4bf400df1712408fe83ba199a66a1b57ab1d;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/phy.c
	drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
---

252f4bf400df1712408fe83ba199a66a1b57ab1d
Reading git-diff-tree failed