diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 08:53:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 08:53:20 -0400 |
| commit | f12e6a451aad671a724e61abce2b8b323f209355 (patch) | |
| tree | e4969282d07f7682099291e59545744b3bb5dcac /arch/x86/kernel/cpuid.c | |
| parent | 046fd53773cd87125f799b00422e487bf1428d38 (diff) | |
| parent | dc44e65943169de2d1a1b494876f48a65a9737f1 (diff) | |
Merge branch 'x86/cleanups' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpuid.c')
| -rw-r--r-- | arch/x86/kernel/cpuid.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 8e9cd6a8ec12..6a44d6465991 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/smp_lock.h> | 36 | #include <linux/smp_lock.h> |
| 37 | #include <linux/major.h> | 37 | #include <linux/major.h> |
| 38 | #include <linux/fs.h> | 38 | #include <linux/fs.h> |
| 39 | #include <linux/smp_lock.h> | ||
| 40 | #include <linux/device.h> | 39 | #include <linux/device.h> |
| 41 | #include <linux/cpu.h> | 40 | #include <linux/cpu.h> |
| 42 | #include <linux/notifier.h> | 41 | #include <linux/notifier.h> |