From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 9 Apr 2010 17:42:26 +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~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1805a34fa33b6284ab8139dd43779b94de58669a;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-4965.c
---

1805a34fa33b6284ab8139dd43779b94de58669a
Reading git-diff-tree failed