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

f7ba35da

Commit f7ba35da authored 13 years ago by David S. Miller

Downloads
- Plain Diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

parents 01b7806c 15e5209f

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/ethernet/intel/igb/igb.h 3 additions, 0 deletions

drivers/net/ethernet/intel/igb/igb.h
drivers/net/ethernet/intel/igb/igb_main.c 147 additions, 30 deletions

drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/igbvf/netdev.c 2 additions, 2 deletions

drivers/net/ethernet/intel/igbvf/netdev.c
drivers/net/ethernet/intel/ixgbe/ixgbe.h 2 additions, 1 deletion

drivers/net/ethernet/intel/ixgbe/ixgbe.h
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c 2 additions, 0 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c 8 additions, 8 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c 78 additions, 6 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c 4 additions, 3 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

with 246 additions and 50 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