From: David S. Miller <davem@davemloft.net>
Date: Thu, 7 Apr 2011 21:05:23 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.0-rc1~377^2~489
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1e48efc701b79ee4367c9a1a4e8bbc7c3586e02;p=pandora-kernel.git

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

Conflicts:
	drivers/net/benet/be_main.c
---

c1e48efc701b79ee4367c9a1a4e8bbc7c3586e02
Reading git-diff-tree failed