From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 11 May 2010 18:24:55 +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~167
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc755896a4274f11283bca32d1d658203844057a;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
---

cc755896a4274f11283bca32d1d658203844057a
Reading git-diff-tree failed