From: David S. Miller <davem@davemloft.net>
Date: Tue, 15 Jun 2010 05:59:34 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.36-rc1~571^2~596
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b08f516244abda22c07b5e7db10ef109dc43f2d;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ixgbe/ixgbe_ethtool.c

With merge conflict help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

6b08f516244abda22c07b5e7db10ef109dc43f2d
Reading git-diff-tree failed