From: David S. Miller <davem@davemloft.net>
Date: Thu, 15 May 2008 07:34:44 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~442
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63fe46da9c380b3f2bbdf3765044649517cc717c;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c
---

63fe46da9c380b3f2bbdf3765044649517cc717c
Reading git-diff-tree failed