From: David S. Miller <davem@davemloft.net>
Date: Tue, 19 Apr 2011 07:21:33 +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~312
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1943424e43974f85b82bb31eaf832823bf49ce7;p=pandora-kernel.git

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

Conflicts:
	drivers/net/bnx2x/bnx2x_ethtool.c
---

e1943424e43974f85b82bb31eaf832823bf49ce7
Reading git-diff-tree failed