From: David S. Miller <davem@davemloft.net>
Date: Fri, 30 Jan 2009 22:31:07 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.30-rc1~662^2~870
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=05bee4737774881e027bfd9a8b5c40a7d68f6325;p=users%2Fjedix%2Flinux-maple.git

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

Conflicts:
	drivers/net/e1000/e1000_main.c
---

05bee4737774881e027bfd9a8b5c40a7d68f6325