Skip to content
Snippets Groups Projects
Commit 0e396ee4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents b8112df7 2089a0d3
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1947 additions and 3283 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment