diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-25 09:16:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-25 09:16:14 +0100 |
| commit | 2b45e0f9f34f718725e093f4e335600811d7105a (patch) | |
| tree | 3c6d594539eb16fc955906da65b9fa7aacbc9145 /arch/x86/kernel/cpu/umc.c | |
| parent | arch/x86/mm/srat: Skip NUMA_NO_NODE while parsing SLIT (diff) | |
| parent | Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-2b45e0f9f34f718725e093f4e335600811d7105a.tar.xz linux-2b45e0f9f34f718725e093f4e335600811d7105a.zip | |
Merge branch 'linus' into x86/urgent
Merge in the x86 changes to apply a fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/umc.c')
| -rw-r--r-- | arch/x86/kernel/cpu/umc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c index 75c5ad5d35cc..ef9c2a0078bd 100644 --- a/arch/x86/kernel/cpu/umc.c +++ b/arch/x86/kernel/cpu/umc.c @@ -1,5 +1,4 @@ #include <linux/kernel.h> -#include <linux/init.h> #include <asm/processor.h> #include "cpu.h" |