summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-01-30 11:21:40 +0100
committerIngo Molnar <mingo@kernel.org>2016-01-30 11:21:40 +0100
commit78726ee5ff3fc76697c8754e0f546915bd61e7c6 (patch)
tree3205c3066b632aade9bad9e1951586b065ac2192 /tools
parent1e423bff959e48166f5b7efca01fdb0dbdf05846 (diff)
parenta1ff5726081858a9ad98934eff7af6616c576875 (diff)
downloadlinux-78726ee5ff3fc76697c8754e0f546915bd61e7c6.tar.bz2
Merge branch 'x86/cpu' into x86/asm, to avoid conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions