Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d9e34325

Commit d9e34325 authored 19 years ago by Jeff Garzik

Downloads
- Plain Diff

Merge branch 'upstream-fixes'

parents 500f83ab 832f8f03

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/Kconfig 4 additions, 4 deletions

drivers/net/Kconfig
drivers/net/bonding/bond_main.c 69 additions, 211 deletions

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

drivers/net/bonding/bonding.h
drivers/net/ibm_emac/ibm_emac_core.c 31 additions, 0 deletions

drivers/net/ibm_emac/ibm_emac_core.c
drivers/net/ns83820.c 1 addition, 1 deletion

drivers/net/ns83820.c
drivers/net/starfire.c 24 additions, 22 deletions

drivers/net/starfire.c
drivers/net/sungem.h 2 additions, 1 deletion

drivers/net/sungem.h
drivers/net/tulip/21142.c 1 addition, 1 deletion

drivers/net/tulip/21142.c
net/ieee80211/ieee80211_tx.c 1 addition, 1 deletion

net/ieee80211/ieee80211_tx.c

with 135 additions and 243 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