Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments
- Terraform modules

Snippets Groups Projects

00ab2f3d

Commit 00ab2f3d 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 4cf808eb f5e2a7b2

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/Kconfig 2 additions, 3 deletions

drivers/net/Kconfig
drivers/net/bonding/bond_main.c 1 addition, 0 deletions

drivers/net/bonding/bond_main.c
drivers/net/sis190.c 2 additions, 2 deletions

drivers/net/sis190.c
drivers/net/skge.c 9 additions, 1 deletion

drivers/net/skge.c
drivers/net/sky2.c 30 additions, 1 deletion

drivers/net/sky2.c
drivers/net/tokenring/smctr.h 1 addition, 1 deletion

drivers/net/tokenring/smctr.h
drivers/net/wireless/atmel.c 59 additions, 39 deletions

drivers/net/wireless/atmel.c
drivers/net/wireless/wavelan_cs.c 4 additions, 12 deletions

drivers/net/wireless/wavelan_cs.c
drivers/s390/net/lcs.c 17 additions, 14 deletions

drivers/s390/net/lcs.c
drivers/s390/net/lcs.h 1 addition, 1 deletion

drivers/s390/net/lcs.h
drivers/s390/net/qeth.h 47 additions, 65 deletions

drivers/s390/net/qeth.h
drivers/s390/net/qeth_eddp.c 9 additions, 2 deletions

drivers/s390/net/qeth_eddp.c
drivers/s390/net/qeth_main.c 7 additions, 10 deletions

drivers/s390/net/qeth_main.c

with 189 additions and 151 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