diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:36:36 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:37:18 -0400 |
commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /arch/alpha/boot/main.c | |
parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/alpha/boot/main.c')
-rw-r--r-- | arch/alpha/boot/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c index 644b7db55438..ded57d9a80e1 100644 --- a/arch/alpha/boot/main.c +++ b/arch/alpha/boot/main.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * This file is the bootloader for the Linux/AXP kernel | 6 | * This file is the bootloader for the Linux/AXP kernel |
7 | */ | 7 | */ |
8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
9 | #include <linux/slab.h> | ||
9 | #include <linux/string.h> | 10 | #include <linux/string.h> |
10 | #include <generated/utsrelease.h> | 11 | #include <generated/utsrelease.h> |
11 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |