Arnaldo Carvalho de Melo 7c940c18c5 Merge remote branch 'acme/perf/urgent' into perf/core ... Fixups due to rename of event_t routines from event__ to perf_event__ done in perf/core. Conflicts: tools/perf/builtin-record.c tools/perf/builtin-top.c tools/perf/util/event.c tools/perf/util/event.h Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>		2011-02-11 11:45:54 -02:00
..
firewire	tools/firewire: nosy-dump: increment program version	2010-07-27 11:04:12 +02:00
perf	Merge remote branch 'acme/perf/urgent' into perf/core	2011-02-11 11:45:54 -02:00
power/x86	Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools	2011-01-11 23:06:28 -05:00
slub	slub: move slabinfo.c to tools/slub/slabinfo.c	2010-11-06 09:04:32 +02:00
testing/ktest	ktest: Ask for the manditory config options instead of just failing	2010-11-18 15:39:48 -05:00
usb	USB: testusb: testusb compatibility with FunctionFS gadget	2010-05-20 13:21:43 -07:00
virtio	tools/virtio: virtio_test tool	2010-12-09 16:00:22 +02:00