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

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

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

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

2bd93d7af1581d40e3c4b25242472661cb7c637a
Reading git-diff-tree failed