Merge branch 'x86/tsc' into tracing/core

Browse source

Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:

Conflicts:
	arch/x86/kernel/cpu/intel.c

...

This commit is contained in:

Ingo Molnar 2008-12-25 12:48:18 +01:00

parent 30cd324e97 7e3cbc3f77

commit a3eeeefbf1

6 changed files with 40 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

arch/x86/include/asm/cpufeature.h

View file

8

arch/x86/kernel/cpu/addon_cpuid_features.c

View file

9

arch/x86/kernel/cpu/amd.c

View file

18

arch/x86/kernel/cpu/intel.c

View file

2

arch/x86/kernel/process.c

View file

6

drivers/acpi/processor_idle.c

View file