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

Conflicts:
	drivers/net/benet/be_cmds.h
	include/linux/sysctl.h

2010-01-10 22:55:03 -08:00

..

datagram.c

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

2009-11-06 00:55:55 -08:00

dev_mcast.c

net: Rationalise email address: Network Specific Parts

2008-10-13 19:01:08 -07:00

dev.c

net: Make it easier to parse /proc/net/dev contents.

2010-01-07 00:59:10 -08:00

drop_monitor.c

net: Replace old style lock initializer

2009-11-07 00:46:34 -08:00

dst.c

net: speedup dst_release()

2008-11-14 00:53:54 -08:00

ethtool.c

ethtool: Add reset operation

2009-10-07 01:10:44 -07:00

fib_rules.c

net: Allow fib_rule_unregister to batch

2009-12-03 12:22:55 -08:00

filter.c

filter: Add SKF_AD_QUEUE instruction

2009-10-20 01:06:22 -07:00

flow.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

gen_estimator.c

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

gen_stats.c

pkt_sched: gen_estimator: Dont report fake rate estimators

2009-10-07 01:07:42 -07:00

iovec.c

net: Fix memcpy_toiovecend() to use the right offset

2009-06-08 00:25:39 -07:00

kmap_skb.h

[PATCH] severing skbuff.h -> highmem.h

2006-12-04 02:00:29 -05:00

link_watch.c

linkwatch: linkwatch_forget_dev() to speedup device dismantle

2009-11-18 05:03:11 -08:00

Makefile

skbuff: remove skb_dma_map/unmap

2009-12-02 19:57:15 -08:00

neighbour.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2009-12-08 07:55:01 -08:00

net_namespace.c

netns: Add an explicit rcu_barrier to unregister_pernet_{device|subsys}

2009-12-03 12:22:03 -08:00

net-sysfs.c

net: use net_eq to compare nets

2009-11-25 15:14:13 -08:00

net-sysfs.h

netns: Fix device renaming for sysfs

2008-05-02 17:00:58 -07:00

net-traces.c

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

2009-06-15 03:02:23 -07:00

netevent.c

[NET]: net/core/netevent.c should #include <net/netevent.h>

2007-07-05 17:40:27 -07:00

netpoll.c

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

2009-09-02 00:32:56 -07:00

pktgen.c

pktgen: ndo_start_xmit can return NET_XMIT_xxx values

2009-12-23 22:02:57 -08:00

request_sock.c

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

rtnetlink.c

net: Fix userspace RTM_NEWLINK notifications.

2009-12-13 19:45:22 -08:00

scm.c

Merge branch 'master' into next

2008-11-18 18:52:37 +11:00

skbuff.c

const: constify remaining pipe_buf_operations

2009-12-16 07:20:05 -08:00

sock.c

tcp: update the netstamp_needed counter when cloning sockets

2010-01-08 00:00:09 -08:00

stream.c

tcp: tcp_prequeue() can use keyed wakeups

2009-05-17 20:44:43 -07:00

sysctl_net_core.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2009-12-08 07:55:01 -08:00

user_dma.c

net/core/user_dma.c: Use frag list abstraction interfaces.

2009-06-09 00:19:10 -07:00

utils.c

printk: Remove ratelimit.h from kernel.h

2009-09-22 16:18:09 +02:00