Ingo Molnar 96200591a3 Merge branch 'tracing/hw-breakpoints' into perf/core ...

Conflicts:
	arch/x86/kernel/kprobes.c
	kernel/trace/Makefile

Merge reason: hw-breakpoints perf integration is looking
              good in testing and in reviews, plus conflicts
              are mounting up - so merge & resolve.

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

2009-11-21 14:07:23 +01:00

..

acpi

ACPI: remove acpi_device_uid() and related stuff

2009-09-25 15:09:49 -04:00

asm-generic

alpha: fix F_SETOWN_EX and F_GETLK64 conflict

2009-11-12 07:25:56 -08:00

crypto

…

drm

Merge branch 'drm-next' of ../drm-next into drm-linus

2009-10-08 14:03:05 +10:00

keys

…

linux

Merge branch 'tracing/hw-breakpoints' into perf/core

2009-11-21 14:07:23 +01:00

math-emu

…

media

…

mtd

…

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-09 09:51:42 -08:00

pcmcia

PM / yenta: Split resume into early and late parts (rev. 4)

2009-11-03 10:54:58 +01:00

rdma

…

rxrpc

…

scsi

[SCSI] libiscsi: iscsi_session_setup to allow for private space

2009-10-02 14:01:39 -05:00

sound

…

trace

Merge branch 'perf/core' into perf/probes

2009-11-17 10:17:47 +01:00

video

…

xen

…

Kbuild

…