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

2a6cf355

Commit 2a6cf355 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 8ba25dad 3f8b4b13

No related branches found

No related tags found

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/networking/bonding.txt 9 additions, 7 deletions

Documentation/networking/bonding.txt
drivers/net/atlx/atl1.c 25 additions, 43 deletions

drivers/net/atlx/atl1.c
drivers/net/atlx/atl1.h 2 additions, 2 deletions

drivers/net/atlx/atl1.h
drivers/net/atlx/atl2.c 27 additions, 36 deletions

drivers/net/atlx/atl2.c
drivers/net/atlx/atl2.h 0 additions, 1 deletion

drivers/net/atlx/atl2.h
drivers/net/atlx/atlx.c 0 additions, 13 deletions

drivers/net/atlx/atlx.c
drivers/net/forcedeth.c 1 addition, 1 deletion

drivers/net/forcedeth.c
drivers/net/ixgbe/ixgbe.h 1 addition, 0 deletions

drivers/net/ixgbe/ixgbe.h
drivers/net/ixgbe/ixgbe_82598.c 12 additions, 0 deletions

drivers/net/ixgbe/ixgbe_82598.c
drivers/net/ixgbe/ixgbe_ethtool.c 27 additions, 0 deletions

drivers/net/ixgbe/ixgbe_ethtool.c
drivers/net/ixgbe/ixgbe_main.c 33 additions, 0 deletions

drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_phy.c 68 additions, 0 deletions

drivers/net/ixgbe/ixgbe_phy.c
drivers/net/ixgbe/ixgbe_phy.h 7 additions, 0 deletions

drivers/net/ixgbe/ixgbe_phy.h
drivers/net/ixgbe/ixgbe_type.h 6 additions, 0 deletions

drivers/net/ixgbe/ixgbe_type.h
drivers/net/smc91x.c 1 addition, 1 deletion

drivers/net/smc91x.c

with 219 additions and 104 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