From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Oct 2010 19:30: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.37-rc1~147^2~167
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d122179a3c0fdc71b88cb9e3605f372b1651a9ff;p=pandora-kernel.git

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

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

d122179a3c0fdc71b88cb9e3605f372b1651a9ff
Reading git-diff-tree failed