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

0ecc103a

Commit 0ecc103a authored 16 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:
	drivers/net/gianfar.c

parents 0012985d 4906f998

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

drivers/atm/solos-pci.c 1 addition, 0 deletions

drivers/atm/solos-pci.c
drivers/isdn/hardware/mISDN/hfcmulti.c 2 additions, 0 deletions

drivers/isdn/hardware/mISDN/hfcmulti.c
drivers/net/gianfar.c 6 additions, 0 deletions

drivers/net/gianfar.c
drivers/net/netxen/netxen_nic.h 1 addition, 1 deletion

drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c 12 additions, 1 deletion

drivers/net/netxen/netxen_nic_main.c
drivers/net/tulip/de2104x.c 2 additions, 1 deletion

drivers/net/tulip/de2104x.c
drivers/net/tun.c 8 additions, 2 deletions

drivers/net/tun.c
net/bridge/br_forward.c 6 additions, 1 deletion

net/bridge/br_forward.c
net/ipv6/ip6_tunnel.c 1 addition, 1 deletion

net/ipv6/ip6_tunnel.c
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 23 additions, 2 deletions

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
net/netfilter/nf_conntrack_netlink.c 13 additions, 2 deletions

net/netfilter/nf_conntrack_netlink.c
net/netfilter/xt_sctp.c 1 addition, 1 deletion

net/netfilter/xt_sctp.c

with 76 additions and 12 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