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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
	net/core/dev.c

2010-04-21 01:14:25 -07:00

..

datagram.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

dev_addr_lists.c

net: include linux/proc_fs.h in dev_addr_lists.c

2010-04-07 16:46:36 -07:00

dev.c

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

2010-04-21 01:14:25 -07:00

drop_monitor.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dst.c

dst: don't inline dst_ifdown

2010-04-13 03:32:44 -07:00

ethtool.c

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

2010-04-11 14:53:53 -07:00

fib_rules.c

net: fib_rules: set family in fib_rule_hdr centrally

2010-04-13 14:49:30 -07:00

filter.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

flow.c

flow: delayed deletion of flow cache entries

2010-04-07 03:43:20 -07:00

gen_estimator.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

gen_stats.c

pkt_sched: gen_estimator: Dont report fake rate estimators

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

iovec.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

kmap_skb.h

…

link_watch.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Makefile

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

neighbour.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09: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

rps: static functions

2010-04-19 14:40:57 -07:00

net-sysfs.h

…

net-traces.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

netevent.c

…

netpoll.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pktgen.c

pktgen node allocation

2010-03-21 20:33:36 -07:00

request_sock.c

…

rtnetlink.c

net: fib_rules: decouple address families from real address families

2010-04-13 14:49:31 -07:00

scm.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

skbuff.c

net: Remove two unnecessary exports (skbuff).

2010-04-20 22:39:53 -07:00

sock.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

stream.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

sysctl_net_core.c

rfs: Receive Flow Steering

2010-04-16 16:01:27 -07:00

user_dma.c

…

utils.c

printk: Remove ratelimit.h from kernel.h

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