Ingo Molnar c1ab9cab75 Merge branch 'linus' into tracing/core ...

Conflicts:
	include/linux/module.h
	kernel/module.c

Semantic conflict:
	include/trace/events/module.h

Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up
              possibly racy module refcounting")

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2010-04-08 10:18:47 +02:00

..

bkl.h

events: Harmonize event field names and print output names

2009-10-15 12:42:03 +02:00

block.h

tracing: Convert some block events to DEFINE_EVENT

2009-11-26 09:14:04 +01:00

ext4.h

ext4: Add new tracepoints to debug delayed allocation space functions

2010-01-01 01:00:21 -05:00

irq.h

tracing: Convert softirq events to DEFINE_EVENT

2009-11-26 09:14:03 +01:00

jbd2.h

ext4: Add new tracepoint for jbd2_cleanup_journal_tail

2009-12-23 07:45:44 -05:00

kmem.h

tracing: Convert some kmem events to DEFINE_EVENT

2009-11-26 09:14:02 +01:00

kvm.h

KVM: MMU: Add tracepoint for guest page aging

2010-03-01 12:36:09 -03:00

lock.h

perf lock: Enhance information of lock trace events

2010-01-31 09:08:23 +01:00

mce.h

perf_event, x86, mce: Use TRACE_EVENT() for MCE logging

2009-10-13 09:43:38 +02:00

module.h

Merge branch 'linus' into tracing/core

2010-04-08 10:18:47 +02:00

napi.h

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

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

power.h

tracing: Convert some power events to DEFINE_EVENT

2009-11-26 09:14:03 +01:00

sched.h

tracepoint: Move signal sending tracepoint to events/signal.h

2009-11-26 10:55:37 +01:00

signal.h

tracing: Convert some signal events to DEFINE_TRACE

2010-03-31 22:56:54 -04:00

skb.h

net: skb ftracer - add tracepoint to skb_copy_datagram_iovec (v3)

2009-08-13 16:26:14 -07:00

syscalls.h

tracing: Separate raw syscall from syscall tracer

2009-11-25 14:20:06 -05:00

timer.h

itimer: Fix the itimer trace print format

2009-12-10 13:23:19 +01:00

workqueue.h

tracing: Convert some workqueue events to DEFINE_EVENT

2009-11-26 09:14:03 +01:00