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

b57dfbc4

Commit b57dfbc4 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 42fe95ca e8ef7f29

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/e1000/e1000_ethtool.c 1 addition, 1 deletion

drivers/net/e1000/e1000_ethtool.c
drivers/net/e1000/e1000_main.c 8 additions, 0 deletions

drivers/net/e1000/e1000_main.c
drivers/net/e1000e/netdev.c 4 additions, 30 deletions

drivers/net/e1000e/netdev.c
drivers/net/gianfar.c 2 additions, 2 deletions

drivers/net/gianfar.c
drivers/net/gianfar_mii.c 2 additions, 2 deletions

drivers/net/gianfar_mii.c
drivers/net/hamradio/mkiss.c 2 additions, 3 deletions

drivers/net/hamradio/mkiss.c
drivers/net/igb/igb_ethtool.c 1 addition, 1 deletion

drivers/net/igb/igb_ethtool.c
drivers/net/igb/igb_main.c 0 additions, 28 deletions

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

drivers/net/ixgb/ixgb_ethtool.c
drivers/net/ixgbe/ixgbe_main.c 33 additions, 8 deletions

drivers/net/ixgbe/ixgbe_main.c
drivers/net/pcmcia/smc91c92_cs.c 10 additions, 2 deletions

drivers/net/pcmcia/smc91c92_cs.c
drivers/net/tsi108_eth.c 50 additions, 22 deletions

drivers/net/tsi108_eth.c

with 114 additions and 100 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