Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

323dbaba

Commit 323dbaba authored 17 years ago by David S. Miller

Downloads
- Plain Diff

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

parents bfa274e2 3bf319a7

No related branches found

No related tags found

Loading

Changes 27

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 7 additions, 4 deletions

MAINTAINERS
drivers/net/cs89x0.c 6 additions, 6 deletions

drivers/net/cs89x0.c
drivers/net/e1000e/82571.c 6 additions, 16 deletions

drivers/net/e1000e/82571.c
drivers/net/e1000e/defines.h 5 additions, 5 deletions

drivers/net/e1000e/defines.h
drivers/net/e1000e/e1000.h 1 addition, 2 deletions

drivers/net/e1000e/e1000.h
drivers/net/e1000e/hw.h 2 additions, 2 deletions

drivers/net/e1000e/hw.h
drivers/net/e1000e/ich8lan.c 12 additions, 12 deletions

drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/lib.c 13 additions, 37 deletions

drivers/net/e1000e/lib.c
drivers/net/e1000e/netdev.c 9 additions, 9 deletions

drivers/net/e1000e/netdev.c
drivers/net/e1000e/phy.c 5 additions, 5 deletions

drivers/net/e1000e/phy.c
drivers/net/ehea/ehea.h 33 additions, 1 deletion

drivers/net/ehea/ehea.h
drivers/net/ehea/ehea_main.c 257 additions, 24 deletions

drivers/net/ehea/ehea_main.c
drivers/net/fs_enet/fs_enet-main.c 1 addition, 6 deletions

drivers/net/fs_enet/fs_enet-main.c
drivers/net/gianfar.c 7 additions, 7 deletions

drivers/net/gianfar.c
drivers/net/igb/igb_main.c 6 additions, 9 deletions

drivers/net/igb/igb_main.c
drivers/net/ixgb/ixgb_ethtool.c 1 addition, 0 deletions

drivers/net/ixgb/ixgb_ethtool.c
drivers/net/macb.c 1 addition, 1 deletion

drivers/net/macb.c
drivers/net/pcmcia/pcnet_cs.c 8 additions, 2 deletions

drivers/net/pcmcia/pcnet_cs.c
drivers/net/phy/mdio_bus.c 2 additions, 2 deletions

drivers/net/phy/mdio_bus.c
drivers/net/sis190.c 10 additions, 5 deletions

drivers/net/sis190.c

with 392 additions and 155 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