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

..

firewire

tools/firewire: nosy-dump: increment program version

2010-07-27 11:04:12 +02:00

hv

Staging: hv: move hyperv code out of staging directory

2011-10-10 22:52:55 -06:00

lguest

lguest: move the lguest tool to the tools directory

2012-01-12 15:44:47 +10:30

nfsd

NFSD: Added fault injection script

2011-11-07 21:10:47 -05:00

perf

Merge branch 'perf/urgent' into perf/core

2012-03-05 09:20:08 +01:00

power

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-01-18 15:51:48 -08:00

slub

Merge branches 'slab/next' and 'slub/partial' into slab/for-linus

2011-10-26 18:09:12 +03:00

testing

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

2012-01-16 17:53:27 -08:00

usb

USB: ffs-test: fix header path

2011-02-28 19:27:12 -08:00

virtio

virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf

2012-01-12 15:44:42 +10:30