Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (a7c2491a) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

a7c2491a

Commit a7c2491a authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 1836098f 3df3cc6d

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/phy/phy_device.c 4 additions, 0 deletions

drivers/net/phy/phy_device.c
drivers/net/wireless/orinoco_nortel.c 5 additions, 1 deletion

drivers/net/wireless/orinoco_nortel.c
drivers/s390/net/qeth_eddp.c 2 additions, 1 deletion

drivers/s390/net/qeth_eddp.c
drivers/s390/net/qeth_main.c 29 additions, 32 deletions

drivers/s390/net/qeth_main.c
drivers/s390/net/qeth_mpc.c 1 addition, 1 deletion

drivers/s390/net/qeth_mpc.c
drivers/s390/net/qeth_mpc.h 2 additions, 2 deletions

drivers/s390/net/qeth_mpc.h
drivers/s390/net/qeth_proc.c 29 additions, 221 deletions

drivers/s390/net/qeth_proc.c
drivers/s390/net/qeth_sys.c 3 additions, 3 deletions

drivers/s390/net/qeth_sys.c
drivers/s390/net/qeth_tso.h 2 additions, 2 deletions

drivers/s390/net/qeth_tso.h

with 77 additions and 263 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