Steven Rostedt ff5f149b6a Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7 ...

Conflicts:
	include/linux/ftrace_event.h
	include/trace/ftrace.h
	kernel/trace/trace_event_perf.c
	kernel/trace/trace_kprobe.c
	kernel/trace/trace_syscalls.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2010-05-21 11:49:57 -04:00

..

datagram.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

dev_mcast.c

net: Fix dev_mc_add()

2010-03-10 07:32:28 -08:00

dev.c

veth: Dont kfree_skb() after dev_forward_skb()

2010-05-06 00:53:53 -07:00

drop_monitor.c

tracing: Let tracepoints have data passed to tracepoint callbacks

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

dst.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

ethtool.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

fib_rules.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

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

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08: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

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

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

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

skbuff: remove skb_dma_map/unmap

2009-12-02 19:57:15 -08: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

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-sysfs.h

netns: Fix device renaming for sysfs

2008-05-02 17:00:58 -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

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

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

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

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

request_sock.c

net: convert BUG_TRAP to generic WARN_ON

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

rtnetlink.c

rtnetlink: make SR-IOV VF interface symmetric

2010-05-16 01:05:45 -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

const: constify remaining pipe_buf_operations

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

sock.c

sock.c: potential null dereference

2010-03-07 15:25:50 -08:00

stream.c

tcp: tcp_prequeue() can use keyed wakeups

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

sysctl_net_core.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

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