forked from Minki/linux
a3eeeefbf1
Merge it to resolve this incidental conflict between the BTS fixes/cleanups and changes in x86/tsc: Conflicts: arch/x86/kernel/cpu/intel.c |
||
---|---|---|
.. | ||
asm |
a3eeeefbf1
Merge it to resolve this incidental conflict between the BTS fixes/cleanups and changes in x86/tsc: Conflicts: arch/x86/kernel/cpu/intel.c |
||
---|---|---|
.. | ||
asm |