diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:47 +0100 |
| commit | e4e91ac410356da3a518188f371e9d3b52ee38ee (patch) | |
| tree | e1b33743a08847030285d34bcb2eb8ba90f30a0c /arch/x86/kernel/msr.c | |
| parent | ea7872b9d6a81101f6ba0ec141544a62fea35876 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/msr.c')
| -rw-r--r-- | arch/x86/kernel/msr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index 7bf2dc4c8f7..12fcbe2c143 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -30,7 +30,6 @@ #include <linux/init.h> #include <linux/poll.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/major.h> #include <linux/fs.h> #include <linux/device.h> |