You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 74d154189d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwmc3200wifi/netdev.c net/wireless/scan.c		16 years ago
..
Makefile	Network Drop Monitor: Adding Build changes to enable drop monitor	16 years ago
datagram.c	net: adding memory barrier to the poll and receive callbacks	16 years ago
dev.c	net: convert remaining non-symbolic return values in ndo_start_xmit() functions	16 years ago
dev_mcast.c	…
drop_monitor.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	16 years ago
dst.c	…
ethtool.c	core: remove pointless conditional before kfree()	16 years ago
fib_rules.c	net: Remove unused parameter from fill method in fib_rules_ops.	16 years ago
filter.c	filter: add SKF_AD_NLATTR_NEST to look for nested attributes	16 years ago
flow.c	netns xfrm: lookup in netns	16 years ago
gen_estimator.c	pkt_sched: gen_estimator: Fix signed integers right-shifts.	16 years ago
gen_stats.c	…
iovec.c	net: Fix memcpy_toiovecend() to use the right offset	16 years ago
kmap_skb.h	…
link_watch.c	Revert "net: Fix for initial link state in 2.6.28"	16 years ago
neighbour.c	net: Rename lookup_neigh_params function	16 years ago
net-sysfs.c	net: Remove bogus reference to BUS_ID_SIZE in sysfs code.	16 years ago
net-sysfs.h	…
net-traces.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	16 years ago
net_namespace.c	net: move and export get_net_ns_by_pid	16 years ago
netevent.c	…
netpoll.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
pktgen.c	net pkgen.c:fix no need for check	16 years ago
request_sock.c	…
rtnetlink.c	net: move and export get_net_ns_by_pid	16 years ago
scm.c	…
skb_dma_map.c	net: skb_shared_info optimization	16 years ago
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	16 years ago
sock.c	Fix error return for setsockopt(SO_TIMESTAMPING)	16 years ago
stream.c	tcp: tcp_prequeue() can use keyed wakeups	16 years ago
sysctl_net_core.c	sysctl: fix sparse warning: Should it be static?	16 years ago
user_dma.c	net/core/user_dma.c: Use frag list abstraction interfaces.	16 years ago
utils.c	net: core: remove unneeded include in net/core/utils.c.	16 years ago