Ingo Molnar 3ce2a0bc9d Merge branch 'perf/urgent' into perf/core ... Conflicts: tools/perf/util/python.c Merge reason: resolve the conflict with perf/urgent. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2011-06-04 12:28:05 +02:00
..
firewire	tools/firewire: nosy-dump: increment program version	2010-07-27 11:04:12 +02:00
perf	perf python: Fix argument name list of read_on_cpu()	2011-06-03 10:09:22 -03:00
power/x86	Merge branch 'master' into for-next	2011-04-26 10:22:59 +02:00
slub	slub: move slabinfo.c to tools/slub/slabinfo.c	2010-11-06 09:04:32 +02:00
testing/ktest	ktest: Allow options to be used by other options	2011-05-20 15:48:59 -04:00
usb	USB: ffs-test: fix header path	2011-02-28 19:27:12 -08:00
virtio	virtio_test: support event index	2011-05-30 11:14:15 +09:30