From: David S. Miller <davem@davemloft.net>
Date: Wed, 8 Oct 2008 21:56:41 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.28-rc1~717^2~85
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dd565134ece7e5d528d4c5288879310c54419e9;p=pandora-kernel.git

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

Conflicts:

	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/netdev.c
---

4dd565134ece7e5d528d4c5288879310c54419e9
Reading git-diff-tree failed