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

Conflicts:
	drivers/net/ixgbe/ixgbe_ethtool.c

With merge conflict help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2010-06-14 22:59:34 -07:00

..

datagram.c

net: fix lock_sock_bh/unlock_sock_bh

2010-05-27 00:30:53 -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

net: Enable 64-bit net device statistics on 32-bit architectures

2010-06-12 15:51:22 -07:00

drop_monitor.c

tracing: Let tracepoints have data passed to tracepoint callbacks

2010-05-14 09:50:34 -04:00

dst.c

dst: don't inline dst_ifdown

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

ethtool.c

net: Remove unnecessary semicolons after switch statements

2010-05-17 17:44:35 -07:00

fib_rules.c

net: fib_rules: mark arguments to fib_rules_register const and __net_initdata

2010-04-26 16:02:04 +02:00

filter.c

net: Socket filter ancilliary data access for skb->dev->type

2010-04-22 16:05:44 -07:00

flow.c

flow: delayed deletion of flow cache entries

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

gen_estimator.c

pkt_sched: gen_kill_estimator() rcu fixes

2010-06-11 18:37:08 -07: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

net: fix __neigh_event_send()

2010-05-28 01:57:16 -07:00

net_namespace.c

net: disallow to use net_assign_generic externally

2010-04-27 15:49:02 -07:00

net-sysfs.c

net: Enable 64-bit net device statistics on 32-bit architectures

2010-06-12 15:51:22 -07:00

net-sysfs.h

net: Expose all network devices in a namespaces in sysfs

2010-05-21 09:37:34 -07:00

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

net: remove zap_completion_queue

2010-05-31 00:24:01 -07:00

pktgen.c

pktgen: increasing transmission granularity

2010-06-11 18:37:09 -07:00

request_sock.c

…

rtnetlink.c

net: Enable 64-bit net device statistics on 32-bit architectures

2010-06-12 15:51:22 -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: rxhash already set in __copy_skb_header

2010-06-13 17:16:54 -07:00

sock.c

net-caif: Added missing lock validator constants

2010-06-07 01:01:22 -07:00

stream.c

net: sock_def_readable() and friends RCU conversion

2010-05-01 15:00:15 -07:00

sysctl_net_core.c

net: Consistent skb timestamping

2010-05-15 23:57:10 -07:00

user_dma.c

…

utils.c

printk: Remove ratelimit.h from kernel.h

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