aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/include/linux/types.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-08-12 21:38:56 +0200
committerIngo Molnar <mingo@elte.hu>2010-08-12 21:39:04 +0200
commitf46a6804135795f77d096ab0128f27531c7d051c (patch)
tree7cd33f69e3661327739ae4c96e5a8389e7fc912e /tools/perf/util/include/linux/types.h
parentMerge branch 'perf/core' into perf/urgent (diff)
parentMerge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (diff)
downloadlinux-dev-f46a6804135795f77d096ab0128f27531c7d051c.tar.xz
linux-dev-f46a6804135795f77d096ab0128f27531c7d051c.zip
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by: de5d9bf: Move list types from <linux/list.h> to <linux/types.h>. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/include/linux/types.h')
0 files changed, 0 insertions, 0 deletions