From: David S. Miller <davem@davemloft.net>
Date: Tue, 21 Apr 2009 08:32:26 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.31-rc1~14^2~675
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5e9743bb7429f53c83ad69b432f7b661e74c3f0;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Conflicts:
	net/core/dev.c
---

e5e9743bb7429f53c83ad69b432f7b661e74c3f0