Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (43ecb9a3) · Commits · E-EXK4 - Operating System Group / projects / Linux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

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

Snippets Groups Projects

43ecb9a3

Commit 43ecb9a3 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 58cba465 9f3f46b5

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/bonding/bond_alb.c 2 additions, 2 deletions

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

drivers/net/bonding/bonding.h
drivers/net/e100.c 29 additions, 3 deletions

drivers/net/e100.c
drivers/net/gianfar.c 5 additions, 1 deletion

drivers/net/gianfar.c
drivers/net/gianfar_mii.c 4 additions, 1 deletion

drivers/net/gianfar_mii.c
drivers/net/phy/mdio_bus.c 1 addition, 1 deletion

drivers/net/phy/mdio_bus.c
drivers/net/phy/phy.c 1 addition, 1 deletion

drivers/net/phy/phy.c
drivers/net/tulip/uli526x.c 3 additions, 3 deletions

drivers/net/tulip/uli526x.c
drivers/net/via-velocity.c 1 addition, 1 deletion

drivers/net/via-velocity.c
drivers/net/wireless/Kconfig 1 addition, 1 deletion

drivers/net/wireless/Kconfig
drivers/net/wireless/atmel.c 223 additions, 4 deletions

drivers/net/wireless/atmel.c
include/linux/fsl_devices.h 2 additions, 4 deletions

include/linux/fsl_devices.h
include/linux/phy.h 3 additions, 0 deletions

include/linux/phy.h
include/net/ieee80211.h 4 additions, 2 deletions

include/net/ieee80211.h

with 281 additions and 26 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