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

4552e119

Commit 4552e119 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

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

parents f09f7ee2 58c7821c

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/atlx/atl1.c 0 additions, 1 deletion

drivers/net/atlx/atl1.c
drivers/net/enc28j60.c 60 additions, 27 deletions

drivers/net/enc28j60.c
drivers/net/ibm_newemac/Kconfig 1 addition, 0 deletions

drivers/net/ibm_newemac/Kconfig
drivers/net/netxen/netxen_nic.h 1 addition, 17 deletions

drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_ethtool.c 3 additions, 3 deletions

drivers/net/netxen/netxen_nic_ethtool.c
drivers/net/netxen/netxen_nic_hw.c 48 additions, 64 deletions

drivers/net/netxen/netxen_nic_hw.c
drivers/net/netxen/netxen_nic_init.c 21 additions, 25 deletions

drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_isr.c 2 additions, 2 deletions

drivers/net/netxen/netxen_nic_isr.c
drivers/net/netxen/netxen_nic_main.c 41 additions, 92 deletions

drivers/net/netxen/netxen_nic_main.c
drivers/net/netxen/netxen_nic_niu.c 11 additions, 11 deletions

drivers/net/netxen/netxen_nic_niu.c
drivers/net/sky2.c 1 addition, 0 deletions

drivers/net/sky2.c

with 189 additions and 242 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