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

..

acpi

…

asm-generic

Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-05-18 09:17:01 -07:00

crypto

…

drm

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2010-05-07 14:02:01 -07:00

keys

…

linux

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

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

math-emu

…

media

V4L/DVB: saa7146: fix regression of the av7110/budget-av driver

2010-05-06 19:20:50 -03:00

mtd

…

net

tcp: fix MD5 (RFC2385) support

2010-05-16 00:34:04 -07:00

pcmcia

pcmcia: pcmcia_dev_present bugfix

2010-04-21 08:09:17 +02:00

rdma

…

rxrpc

…

scsi

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

sound

Merge branch 'fix/asoc' into for-linus

2010-04-07 09:54:41 +02:00

trace

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

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

video

…

xen

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

Kbuild

…