From: David S. Miller <davem@davemloft.net>
Date: Tue, 27 Oct 2009 08:03:26 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.33-rc1~388^2~701
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfadf853f6cd9689f79a63ca960c6f9d6665314f;p=pandora-kernel.git

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

Conflicts:
	drivers/net/sh_eth.c
---

cfadf853f6cd9689f79a63ca960c6f9d6665314f
Reading git-diff-tree failed