Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (4ec5240e) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

4ec5240e

Commit 4ec5240e authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

parents f49809fe b6016b76

No related branches found

No related tags found

No related merge requests found

Changes 15

Expand all Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/Kconfig 9 additions, 0 deletions

drivers/net/Kconfig
drivers/net/Makefile 1 addition, 0 deletions

drivers/net/Makefile
drivers/net/bnx2.c 5530 additions, 0 deletions

drivers/net/bnx2.c
drivers/net/bnx2.h 4352 additions, 0 deletions

drivers/net/bnx2.h
drivers/net/bnx2_fw.h 2468 additions, 0 deletions

drivers/net/bnx2_fw.h
drivers/net/bonding/bond_main.c 1 addition, 1 deletion

drivers/net/bonding/bond_main.c
include/linux/if_tr.h 3 additions, 3 deletions

include/linux/if_tr.h
include/linux/mii.h 8 additions, 0 deletions

include/linux/mii.h
include/linux/pci_ids.h 2 additions, 0 deletions

include/linux/pci_ids.h
include/linux/pkt_sched.h 8 additions, 1 deletion

include/linux/pkt_sched.h
include/net/xfrm.h 2 additions, 0 deletions

include/net/xfrm.h
net/802/tr.c 13 additions, 13 deletions

net/802/tr.c
net/ipv6/xfrm6_policy.c 4 additions, 0 deletions

net/ipv6/xfrm6_policy.c
net/sched/sch_netem.c 96 additions, 113 deletions

net/sched/sch_netem.c
net/xfrm/xfrm_policy.c 2 additions, 2 deletions

net/xfrm/xfrm_policy.c

with 12499 additions and 133 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