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

b6f40988

Commit b6f40988 authored 14 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6

parents 23624935 6493d24f

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/e1000e/e1000.h 4 additions, 1 deletion

drivers/net/e1000e/e1000.h
drivers/net/e1000e/ethtool.c 22 additions, 30 deletions

drivers/net/e1000e/ethtool.c
drivers/net/e1000e/ich8lan.c 2 additions, 1 deletion

drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/lib.c 2 additions, 2 deletions

drivers/net/e1000e/lib.c
drivers/net/e1000e/netdev.c 79 additions, 38 deletions

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

drivers/net/e1000e/phy.c
drivers/net/igb/e1000_82575.c 1 addition, 0 deletions

drivers/net/igb/e1000_82575.c
drivers/net/igb/e1000_hw.h 1 addition, 0 deletions

drivers/net/igb/e1000_hw.h
drivers/net/igb/igb_main.c 1 addition, 0 deletions

drivers/net/igb/igb_main.c

with 116 additions and 76 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