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

5a412ad7

Commit 5a412ad7 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 301102cc 6716344c

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/e100.c 1 addition, 1 deletion

drivers/net/e100.c
drivers/net/igb/e1000_82575.c 8 additions, 0 deletions

drivers/net/igb/e1000_82575.c
drivers/net/igbvf/ethtool.c 0 additions, 6 deletions

drivers/net/igbvf/ethtool.c
drivers/net/ixgb/ixgb.h 0 additions, 3 deletions

drivers/net/ixgb/ixgb.h
drivers/net/ixgb/ixgb_ethtool.c 12 additions, 34 deletions

drivers/net/ixgb/ixgb_ethtool.c
drivers/net/ixgbe/ixgbe_82598.c 1 addition, 0 deletions

drivers/net/ixgbe/ixgbe_82598.c
drivers/net/ixgbe/ixgbe_82599.c 36 additions, 2 deletions

drivers/net/ixgbe/ixgbe_82599.c
drivers/net/ixgbe/ixgbe_common.c 351 additions, 89 deletions

drivers/net/ixgbe/ixgbe_common.c
drivers/net/ixgbe/ixgbe_common.h 8 additions, 0 deletions

drivers/net/ixgbe/ixgbe_common.h
drivers/net/ixgbe/ixgbe_ethtool.c 64 additions, 51 deletions

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

drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_phy.c 5 additions, 5 deletions

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

drivers/net/ixgbe/ixgbe_type.h
drivers/net/ixgbe/ixgbe_x540.c 62 additions, 7 deletions

drivers/net/ixgbe/ixgbe_x540.c

with 559 additions and 201 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