aboutsummaryrefslogtreecommitdiff
path: root/arch/alpha
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-25 12:48:18 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-25 12:48:18 +0100
commita3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5 (patch)
tree28eedba6d432e9d9d772962e6f92732aef1be065 /arch/alpha
parent30cd324e9787ccc9a5ede59742d5409857550692 (diff)
parent7e3cbc3f774f31ecd88a51edae3d9377f60a4c00 (diff)
Merge branch 'x86/tsc' into tracing/core
Merge it to resolve this incidental conflict between the BTS fixes/cleanups and changes in x86/tsc: Conflicts: arch/x86/kernel/cpu/intel.c
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions