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

3fb17dab

Commit 3fb17dab authored 14 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6

parents e0985f27 310e5ca8

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/e1000/e1000_hw.c 3 additions, 1 deletion

drivers/net/e1000/e1000_hw.c
drivers/net/e1000/e1000_hw.h 1 addition, 0 deletions

drivers/net/e1000/e1000_hw.h
drivers/net/e1000e/netdev.c 0 additions, 1 deletion

drivers/net/e1000e/netdev.c
drivers/net/ixgbe/ixgbe_common.c 3 additions, 0 deletions

drivers/net/ixgbe/ixgbe_common.c
drivers/net/ixgbe/ixgbe_fcoe.c 1 addition, 1 deletion

drivers/net/ixgbe/ixgbe_fcoe.c
drivers/net/ixgbe/ixgbe_main.c 10 additions, 6 deletions

drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_sriov.c 0 additions, 2 deletions

drivers/net/ixgbe/ixgbe_sriov.c
drivers/net/ixgbe/ixgbe_x540.c 3 additions, 3 deletions

drivers/net/ixgbe/ixgbe_x540.c

with 21 additions and 14 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