diff options
author | 2010-05-18 09:27:49 -0700 | |
---|---|---|
committer | 2010-05-18 09:27:49 -0700 | |
commit | 96fbeb973a7e17594a429537201611ca0b395622 (patch) | |
tree | 0f90e3724f804776d6ae00009c2e30bd4ab015aa /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | x86, mrst: add nop functions to x86_init mpparse functions (diff) | |
download | linux-dev-96fbeb973a7e17594a429537201611ca0b395622.tar.xz linux-dev-96fbeb973a7e17594a429537201611ca0b395622.zip |
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mrst: add nop functions to x86_init mpparse functions
x86, mrst, pci: return 0 for non-present pci bars
x86: Avoid check hlt for newer cpus
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions