From: David S. Miller <davem@davemloft.net>
Date: Wed, 21 Apr 2010 08:14:25 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.35-rc1~473^2~430
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87eb367003887cdc81a5d183efea227b5b488961;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
	net/core/dev.c
---

87eb367003887cdc81a5d183efea227b5b488961
Reading git-diff-tree failed