diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-07 08:14:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-07 08:14:15 -0500 |
| commit | 1c2a48cf65580a276552151eb8f78d78c55b828e (patch) | |
| tree | 68ed0628a276b33cb5aa0ad4899c1afe0a33a69d /tools/perf/MANIFEST | |
| parent | 0aa002fe602939370e9476e5ec32b562000a0425 (diff) | |
| parent | cb600d2f83c854ec3d6660063e4466431999489b (diff) | |
Merge branch 'linus' into x86/apic-cleanups
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/MANIFEST')
| -rw-r--r-- | tools/perf/MANIFEST | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index 8c7fc0c8f0b8..c12659d8cb26 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST | |||
| @@ -7,6 +7,7 @@ include/linux/stringify.h | |||
| 7 | lib/rbtree.c | 7 | lib/rbtree.c |
| 8 | include/linux/swab.h | 8 | include/linux/swab.h |
| 9 | arch/*/include/asm/unistd*.h | 9 | arch/*/include/asm/unistd*.h |
| 10 | arch/*/lib/memcpy*.S | ||
| 10 | include/linux/poison.h | 11 | include/linux/poison.h |
| 11 | include/linux/magic.h | 12 | include/linux/magic.h |
| 12 | include/linux/hw_breakpoint.h | 13 | include/linux/hw_breakpoint.h |