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

3b8f5945

Commit 3b8f5945 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-2.6

parents 886d7f44 af667a29

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/e1000/e1000_main.c 9 additions, 1 deletion

drivers/net/e1000/e1000_main.c
drivers/net/e1000e/82571.c 2 additions, 2 deletions

drivers/net/e1000e/82571.c
drivers/net/e1000e/Makefile 1 addition, 1 deletion

drivers/net/e1000e/Makefile
drivers/net/e1000e/defines.h 1 addition, 1 deletion

drivers/net/e1000e/defines.h
drivers/net/e1000e/e1000.h 1 addition, 1 deletion

drivers/net/e1000e/e1000.h
drivers/net/e1000e/es2lan.c 1 addition, 1 deletion

drivers/net/e1000e/es2lan.c
drivers/net/e1000e/ethtool.c 1 addition, 1 deletion

drivers/net/e1000e/ethtool.c
drivers/net/e1000e/hw.h 2 additions, 2 deletions

drivers/net/e1000e/hw.h
drivers/net/e1000e/ich8lan.c 1 addition, 1 deletion

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

drivers/net/e1000e/lib.c
drivers/net/e1000e/netdev.c 113 additions, 110 deletions

drivers/net/e1000e/netdev.c
drivers/net/e1000e/param.c 3 additions, 3 deletions

drivers/net/e1000e/param.c
drivers/net/e1000e/phy.c 2 additions, 2 deletions

drivers/net/e1000e/phy.c

with 147 additions and 136 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