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

97c7b179

Commit 97c7b179 authored 13 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 e933d019 082757af

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/e1000/e1000_main.c 7 additions, 4 deletions

drivers/net/e1000/e1000_main.c
drivers/net/igb/e1000_defines.h 10 additions, 0 deletions

drivers/net/igb/e1000_defines.h
drivers/net/igb/igb_ethtool.c 33 additions, 0 deletions

drivers/net/igb/igb_ethtool.c
drivers/net/ixgbe/ixgbe.h 27 additions, 23 deletions

drivers/net/ixgbe/ixgbe.h
drivers/net/ixgbe/ixgbe_ethtool.c 7 additions, 193 deletions

drivers/net/ixgbe/ixgbe_ethtool.c
drivers/net/ixgbe/ixgbe_fcoe.c 6 additions, 29 deletions

drivers/net/ixgbe/ixgbe_fcoe.c
drivers/net/ixgbe/ixgbe_main.c 248 additions, 232 deletions

drivers/net/ixgbe/ixgbe_main.c

with 338 additions and 481 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