mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-09-14 18:22:56 +00:00
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:
commit
0e396ee43e
38 changed files with 9416 additions and 3857 deletions
1219
drivers/net/dm9000.c
1219
drivers/net/dm9000.c
2066
drivers/net/sk_g16.c
2066
drivers/net/sk_g16.c
3386
drivers/net/skge.c
3386
drivers/net/skge.c
File diff suppressed because it is too large
Load diff
3005
drivers/net/skge.h
3005
drivers/net/skge.h
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue