From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 18 Jun 2005 18:42:35 +0000 (-0700)
Subject: Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev... 
X-Git-Tag: v2.6.13-rc1~90^2~583^2~59
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e396ee43e445cb7c215a98da4e76d0ce354d9d7;p=pandora-kernel.git

Manual merge of /linux/kernel/git/jgarzik/netdev-2.6.git

This is a fixed-up version of the broken "upstream-2.6.13" branch, where
I re-did the manual merge of drivers/net/r8169.c by hand, and made sure
the history is all good.
---

0e396ee43e445cb7c215a98da4e76d0ce354d9d7
Reading git-diff-tree failed