diff options
author | 2011-12-16 11:24:25 +1100 | |
---|---|---|
committer | 2011-12-16 11:24:25 +1100 | |
commit | 1e7342e7789fa2ca9202701467428726cbcfd649 (patch) | |
tree | e0ad000924e9875bd2ea17bd0e04382491765a09 /tools/perf/scripts/python | |
parent | powerpc/pmac: Fix SMP kernels on pre-core99 UP machines (diff) | |
parent | powerpc/47x: Add support for the new IBM currituck platform (diff) | |
download | linux-dev-1e7342e7789fa2ca9202701467428726cbcfd649.tar.xz linux-dev-1e7342e7789fa2ca9202701467428726cbcfd649.zip |
Merge remote-tracking branch 'jwb/next' into next
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions