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

85a43a9e

Commit 85a43a9e 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 23efcb73 42532da6

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/ixgbe/ixgbe.h 16 additions, 5 deletions

drivers/net/ixgbe/ixgbe.h
drivers/net/ixgbe/ixgbe_dcb_nl.c 61 additions, 13 deletions

drivers/net/ixgbe/ixgbe_dcb_nl.c
drivers/net/ixgbe/ixgbe_fcoe.c 31 additions, 108 deletions

drivers/net/ixgbe/ixgbe_fcoe.c
drivers/net/ixgbe/ixgbe_fcoe.h 0 additions, 1 deletion

drivers/net/ixgbe/ixgbe_fcoe.h
drivers/net/ixgbe/ixgbe_main.c 173 additions, 217 deletions

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

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

drivers/net/ixgbe/ixgbe_type.h

with 298 additions and 345 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