forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent

Browse source 
Conflicts:
	tools/perf/builtin-top.c

Semantic conflict:
	util/include/linux/list.h        # fix prefetch.h removal fallout

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2011-05-22 10:07:37 +02:00
commit 3ac1bbcf13
13 changed files with 138 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/util/include/linux/list.h
View file

@ -1,4 +1,6 @@
#include <linux/kernel.h>
#include <linux/prefetch.h>
#include "../../../../include/linux/list.h"
#ifndef PERF_LIST_H