diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:42:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:43:54 +0100 |
| commit | 02ac81a812fe0575a8475a93bdc22fb291ebad91 (patch) | |
| tree | 690f1b48b070f5e268d51c54b63943dc3b807e50 /tools/perf/scripts/python | |
| parent | x86: Emit "mem=nopentium ignored" warning when not supported (diff) | |
| parent | Merge branch 'linus' into x86/bootmem (diff) | |
| download | linux-02ac81a812fe0575a8475a93bdc22fb291ebad91.tar.gz linux-02ac81a812fe0575a8475a93bdc22fb291ebad91.zip | |
Merge branch 'x86/bootmem' into x86/mm
Merge reason: the topic is ready - consolidate it into the more generic x86/mm tree
and prevent conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions