linux/include
Ingo Molnar 32673822e4 Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Conflicts:
	include/linux/perf_event.h

Merge reason: pick up the latest jump-label enhancements, they are cooked ready.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2011-04-27 10:40:21 +02:00
..
acpi
asm-generic Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core 2011-04-27 10:40:21 +02:00
crypto
drm
keys
linux Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core 2011-04-27 10:40:21 +02:00
math-emu
media
mtd
net net/9p: nwname should be an unsigned int 2011-04-15 15:26:15 -05:00
pcmcia
rdma
rxrpc
scsi
sound
staging
target
trace block: make unplug timer trace event correspond to the schedule() unplug 2011-04-16 13:51:05 +02:00
video
xen
Kbuild