Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (44757223) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

44757223

Commit 44757223 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 712fbdd3 ee05f031

No related branches found

No related tags found

Loading

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/iseries_veth.c 581 additions, 288 deletions

drivers/net/iseries_veth.c
drivers/net/iseries_veth.h 0 additions, 46 deletions

drivers/net/iseries_veth.h
drivers/net/tulip/de2104x.c 1 addition, 1 deletion

drivers/net/tulip/de2104x.c
drivers/net/tulip/tulip_core.c 1 addition, 0 deletions

drivers/net/tulip/tulip_core.c

with 583 additions and 335 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment