aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python/export-to-postgresql.py
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-02-01 02:25:06 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2013-02-01 02:28:36 -0800
commit68d00bbebb5a48b7a9056a8c03476a71ecbc30a6 (patch)
tree95af63041b79c43be37d734da6073fc82070f769 /tools/perf/scripts/python/export-to-postgresql.py
parentx86: Don't panic if can not alloc buffer for swiotlb (diff)
parentx86-32, mm: Remove reference to alloc_remap() (diff)
downloadlinux-dev-68d00bbebb5a48b7a9056a8c03476a71ecbc30a6.tar.xz
linux-dev-68d00bbebb5a48b7a9056a8c03476a71ecbc30a6.zip
Merge remote-tracking branch 'origin/x86/mm' into x86/mm2
Explicitly merging these two branches due to nontrivial conflicts and to allow further work. Resolved Conflicts: arch/x86/kernel/head32.c arch/x86/kernel/head64.c arch/x86/mm/init_64.c arch/x86/realmode/init.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions