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

5c509549

Commit 5c509549 authored 13 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 4d586b82 def57687

No related branches found

No related tags found

Loading

Changes 19

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/bonding/bond_main.c 66 additions, 91 deletions

drivers/net/bonding/bond_main.c
drivers/net/tg3.c 67 additions, 2 deletions

drivers/net/tg3.c
drivers/net/usb/cdc_ncm.c 8 additions, 5 deletions

drivers/net/usb/cdc_ncm.c
drivers/net/vmxnet3/vmxnet3_drv.c 3 additions, 0 deletions

drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/vmxnet3/vmxnet3_int.h 2 additions, 2 deletions

drivers/net/vmxnet3/vmxnet3_int.h
include/linux/netdevice.h 6 additions, 1 deletion

include/linux/netdevice.h
include/net/garp.h 1 addition, 0 deletions

include/net/garp.h
include/net/ip_vs.h 4 additions, 5 deletions

include/net/ip_vs.h
net/802/garp.c 12 additions, 2 deletions

net/802/garp.c
net/8021q/vlan_dev.c 4 additions, 2 deletions

net/8021q/vlan_dev.c
net/core/dev.c 25 additions, 0 deletions

net/core/dev.c
net/core/ethtool.c 1 addition, 1 deletion

net/core/ethtool.c
net/ipv4/ip_forward.c 1 addition, 1 deletion

net/ipv4/ip_forward.c
net/ipv4/ip_options.c 2 additions, 2 deletions

net/ipv4/ip_options.c
net/irda/ircomm/ircomm_tty.c 5 additions, 9 deletions

net/irda/ircomm/ircomm_tty.c
net/l2tp/l2tp_core.c 4 additions, 6 deletions

net/l2tp/l2tp_core.c
net/netfilter/ipvs/ip_vs_core.c 2 additions, 22 deletions

net/netfilter/ipvs/ip_vs_core.c
net/netfilter/ipvs/ip_vs_xmit.c 64 additions, 33 deletions

net/netfilter/ipvs/ip_vs_xmit.c
net/sctp/socket.c 6 additions, 7 deletions

net/sctp/socket.c

with 283 additions and 191 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