linux/include
Ingo Molnar 737f24bda7 Merge branch 'perf/urgent' into perf/core
Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/perf.h
	tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2012-03-05 09:20:08 +01:00
..
acpi
asm-generic epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree() 2012-02-24 11:42:50 -08:00
crypto
drm
keys
linux Merge branch 'perf/urgent' into perf/core 2012-03-05 09:20:08 +01:00
math-emu
media
misc
mtd
net Merge branch 'perf/urgent' into perf/core 2012-03-05 09:20:08 +01:00
pcmcia
rdma
rxrpc
scsi
sound
target
trace Merge branch 'perf/urgent' into perf/core 2012-03-05 09:20:08 +01:00
video
xen
Kbuild