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

f11c179e

Commit f11c179e 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/wireless/orinoco/orinoco.c

parents 4545a3f2 0c9a3aaa

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/usb/asix.c 8 additions, 0 deletions

drivers/net/usb/asix.c
drivers/net/wireless/ath9k/main.c 17 additions, 7 deletions

drivers/net/wireless/ath9k/main.c
drivers/net/wireless/orinoco/main.c 15 additions, 4 deletions

drivers/net/wireless/orinoco/main.c
drivers/net/wireless/rtl818x/rtl8187_dev.c 12 additions, 0 deletions

drivers/net/wireless/rtl818x/rtl8187_dev.c
include/linux/netfilter/xt_NFLOG.h 1 addition, 1 deletion

include/linux/netfilter/xt_NFLOG.h
include/net/netfilter/nf_conntrack_core.h 1 addition, 1 deletion

include/net/netfilter/nf_conntrack_core.h
net/ipv4/tcp_scalable.c 1 addition, 1 deletion

net/ipv4/tcp_scalable.c
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 3 additions, 2 deletions

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
net/netfilter/nfnetlink_log.c 5 additions, 3 deletions

net/netfilter/nfnetlink_log.c
net/netfilter/x_tables.c 142 additions, 57 deletions

net/netfilter/x_tables.c
net/netfilter/xt_recent.c 1 addition, 1 deletion

net/netfilter/xt_recent.c

with 206 additions and 77 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