Linux/linux 7a275fd — arch/x86/include/asm intel-family.h mwait.h, arch/x86/kernel/cpu vmware.c
Merge branch 'x86/urgent' into perf/urgent, to pick up new CPU model definitions Signed-off-by: Ingo Molnar <mingo at kernel.org>
| Delta | File | |
|---|---|---|
| +20 | -1 | include/linux/string.h |
| +0 | -21 | lib/string.c |
| +2 | -2 | arch/x86/lib/delay.c |
| +3 | -0 | arch/x86/include/asm/intel-family.h |
| +1 | -1 | arch/x86/include/asm/mwait.h |
| +1 | -1 | arch/x86/kernel/cpu/vmware.c |
| +27 | -26 | 6 files |
