Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (e67b23c7) · Commits · SECO Northern Europe / Kernel / linux-guf · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-guf
- Activity
- Members
- Labels
- Terraform modules
- Model experiments

Snippets Groups Projects

e67b23c7

Commit e67b23c7 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 d4bf2053 f7492f17

No related branches found

No related tags found

Loading

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/au1000_eth.c 1 addition, 0 deletions

drivers/net/au1000_eth.c
drivers/net/e100.c 257 additions, 18 deletions

drivers/net/e100.c
drivers/net/fec_8xx/Kconfig 1 addition, 1 deletion

drivers/net/fec_8xx/Kconfig
drivers/net/ioc3-eth.c 1 addition, 1 deletion

drivers/net/ioc3-eth.c
drivers/net/r8169.c 2 additions, 4 deletions

drivers/net/r8169.c
drivers/net/saa9730.h 25 additions, 11 deletions

drivers/net/saa9730.h
drivers/net/smc91x.c 13 additions, 4 deletions

drivers/net/smc91x.c
drivers/net/wan/hdlc_cisco.c 6 additions, 0 deletions

drivers/net/wan/hdlc_cisco.c
drivers/net/wan/hdlc_fr.c 4 additions, 0 deletions

drivers/net/wan/hdlc_fr.c
drivers/net/wan/hdlc_generic.c 6 additions, 0 deletions

drivers/net/wan/hdlc_generic.c
drivers/net/wireless/hermes.c 3 additions, 3 deletions

drivers/net/wireless/hermes.c
drivers/net/wireless/hermes.h 3 additions, 3 deletions

drivers/net/wireless/hermes.h
drivers/net/wireless/i82593.h 8 additions, 3 deletions

drivers/net/wireless/i82593.h
drivers/net/wireless/ipw2100.c 18 additions, 11 deletions

drivers/net/wireless/ipw2100.c
drivers/net/wireless/ipw2100.h 2 additions, 0 deletions

drivers/net/wireless/ipw2100.h
drivers/net/wireless/prism54/isl_38xx.c 2 additions, 2 deletions

drivers/net/wireless/prism54/isl_38xx.c
include/net/ieee80211.h 1 addition, 1 deletion

include/net/ieee80211.h

with 353 additions and 62 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