From: David S. Miller <davem@davemloft.net>
Date: Tue, 17 May 2011 21:33:11 +0000 (-0400)
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~48
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cbc94eabb0791906051bbfac024ef2c2be8e079;p=pandora-kernel.git

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

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c
---

9cbc94eabb0791906051bbfac024ef2c2be8e079
Reading git-diff-tree failed