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

21a180cd

Commit 21a180cd authored 14 years ago by David S. Miller

Downloads
- Plain Diff

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

Conflicts:
	net/ipv4/Kconfig
	net/ipv4/tcp_timer.c

parents c7d4426a 51e97a12

No related branches found

No related tags found

Loading

Changes 21

Hide whitespace changes

Inline Side-by-side

Showing

arch/um/drivers/net_kern.c 3 additions, 14 deletions

arch/um/drivers/net_kern.c
drivers/net/3c59x.c 10 additions, 0 deletions

drivers/net/3c59x.c
drivers/net/Kconfig 2 additions, 2 deletions

drivers/net/Kconfig
drivers/net/tulip/de2104x.c 5 additions, 2 deletions

drivers/net/tulip/de2104x.c
drivers/vhost/vhost.c 4 additions, 3 deletions

drivers/vhost/vhost.c
include/linux/socket.h 1 addition, 1 deletion

include/linux/socket.h
include/net/route.h 2 additions, 0 deletions

include/net/route.h
net/8021q/vlan_core.c 10 additions, 4 deletions

net/8021q/vlan_core.c
net/9p/trans_virtio.c 2 additions, 1 deletion

net/9p/trans_virtio.c
net/core/iovec.c 3 additions, 2 deletions

net/core/iovec.c
net/core/stream.c 4 additions, 4 deletions

net/core/stream.c
net/ipv4/Kconfig 2 additions, 2 deletions

net/ipv4/Kconfig
net/ipv4/igmp.c 13 additions, 1 deletion

net/ipv4/igmp.c
net/ipv4/route.c 1 addition, 1 deletion

net/ipv4/route.c
net/ipv4/tcp.c 1 addition, 1 deletion

net/ipv4/tcp.c
net/ipv4/tcp_input.c 2 additions, 1 deletion

net/ipv4/tcp_input.c
net/ipv4/tcp_timer.c 14 additions, 11 deletions

net/ipv4/tcp_timer.c
net/ipv6/route.c 25 additions, 5 deletions

net/ipv6/route.c
net/phonet/pep.c 2 additions, 1 deletion

net/phonet/pep.c
net/sctp/auth.c 6 additions, 2 deletions

net/sctp/auth.c

with 112 additions and 58 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