Steven Rostedt f0218b3e99 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-6 ... Conflicts: include/trace/ftrace.h kernel/trace/trace_kprobe.c Acked-by: Masami Hiramatsu <mhiramat@redhat.com> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>		2010-05-18 00:35:23 -04:00
..
acpi	acpi: Support IBM SMBus CMI devices	2010-03-24 14:38:37 +01:00
asm-generic	dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h	2010-03-12 15:52:42 -08:00
crypto	…
drm	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-04-19 07:27:06 -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-6	2010-05-18 00:35:23 -04:00
math-emu	Fix misspellings of "truly" in comments.	2010-02-04 11:55:45 +01:00
media	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
mtd	…
net	net: fix compile error due to double return type in SOCK_DEBUG	2010-05-02 13:42:39 -07:00
pcmcia	pcmcia: pcmcia_dev_present bugfix	2010-04-21 08:09:17 +02:00
rdma	Merge branch 'misc' into for-next	2010-03-01 23:52:31 -08:00
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-6	2010-05-18 00:35:23 -04:00
video	broadsheetfb: support storing waveform	2010-03-12 15:52:34 -08:00
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	…