Manual merge of rsync://rsync.kernel.org/pub/scm/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.
This commit is contained in:
Linus Torvalds 2005-06-18 11:42:35 -07:00
commit 0e396ee43e
38 changed files with 9416 additions and 3857 deletions