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

3c709f8f

Commit 3c709f8f 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-3.6

Conflicts:
	drivers/net/benet/be_main.c

parents 00748209 9bbc052d

No related branches found

No related tags found

No related merge requests found

Changes 37

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/Kconfig 7 additions, 1 deletion

drivers/net/Kconfig
drivers/net/benet/be.h 1 addition, 1 deletion

drivers/net/benet/be.h
drivers/net/benet/be_cmds.c 1 addition, 1 deletion

drivers/net/benet/be_cmds.c
drivers/net/benet/be_main.c 14 additions, 11 deletions

drivers/net/benet/be_main.c
drivers/net/can/slcan.c 3 additions, 1 deletion

drivers/net/can/slcan.c
drivers/net/ehea/ehea_ethtool.c 13 additions, 8 deletions

drivers/net/ehea/ehea_ethtool.c
drivers/net/pch_gbe/pch_gbe_main.c 16 additions, 7 deletions

drivers/net/pch_gbe/pch_gbe_main.c
drivers/net/slip.c 3 additions, 1 deletion

drivers/net/slip.c
drivers/net/usb/cdc_ether.c 1 addition, 1 deletion

drivers/net/usb/cdc_ether.c
drivers/net/usb/ipheth.c 9 additions, 5 deletions

drivers/net/usb/ipheth.c
drivers/net/vmxnet3/vmxnet3_drv.c 6 additions, 4 deletions

drivers/net/vmxnet3/vmxnet3_drv.c
include/net/ip_vs.h 17 additions, 0 deletions

include/net/ip_vs.h
include/net/xfrm.h 3 additions, 0 deletions

include/net/xfrm.h
net/8021q/vlan.c 3 additions, 0 deletions

net/8021q/vlan.c
net/8021q/vlan_dev.c 0 additions, 3 deletions

net/8021q/vlan_dev.c
net/bridge/netfilter/ebtables.c 11 additions, 53 deletions

net/bridge/netfilter/ebtables.c
net/core/dev.c 6 additions, 4 deletions

net/core/dev.c
net/dccp/options.c 2 additions, 0 deletions

net/dccp/options.c
net/ipv4/tcp_cubic.c 7 additions, 2 deletions

net/ipv4/tcp_cubic.c
net/ipv4/xfrm4_output.c 6 additions, 2 deletions

net/ipv4/xfrm4_output.c

with 129 additions and 105 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