From: David S. Miller <davem@davemloft.net>
Date: Tue, 27 Apr 2010 19:49:13 +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~377
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1703b36c358dde24ececba4fd609ecd91433ba3;p=pandora-kernel.git

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

Conflicts:
	drivers/net/e100.c
	drivers/net/e1000e/netdev.c
---

e1703b36c358dde24ececba4fd609ecd91433ba3
Reading git-diff-tree failed