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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-09-11 09:38:37 -07:00
drm	Merge branch 'drm-next' of ../drm-next into drm-linus	2009-10-08 14:03:05 +10:00
keys	RxRPC: Use uX/sX rather than uintX_t/intX_t types	2009-09-16 00:01:13 -07:00
linux	Merge branch 'tracing/hw-breakpoints' into perf/core	2009-11-21 14:07:23 +01:00
math-emu
media	V4L/DVB (13019): video: initial support for ADV7180	2009-09-19 00:53:39 -03:00
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	trivial: fix typo "to to" in multiple files	2009-09-21 15:14:55 +02:00
rxrpc
scsi	[SCSI] libiscsi: iscsi_session_setup to allow for private space	2009-10-02 14:01:39 -05:00
sound	Merge branch 'topic/ymfpci' into for-linus	2009-09-10 15:33:09 +02:00
trace	Merge branch 'perf/core' into perf/probes	2009-11-17 10:17:47 +01:00
video	davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4	2009-09-23 07:39:51 -07:00
xen
Kbuild