diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-30 23:03:50 -0400 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-30 23:03:50 -0400 |
| commit | 558f6ab9106e6be701acb0257e7171df1bbccf04 (patch) | |
| tree | 6e811633baeb676693c493f6c82bf785cab2771d /drivers/char/sysrq.c | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
| parent | 65fb0d23fcddd8697c871047b700c78817bdaa43 (diff) | |
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Conflicts:
arch/x86/include/asm/topology.h
drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
Diffstat (limited to 'drivers/char/sysrq.c')
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 33a9351c896d..3df694e54545 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <linux/vt_kern.h> | 35 | #include <linux/vt_kern.h> |
| 36 | #include <linux/workqueue.h> | 36 | #include <linux/workqueue.h> |
| 37 | #include <linux/kexec.h> | 37 | #include <linux/kexec.h> |
| 38 | #include <linux/irq.h> | 38 | #include <linux/interrupt.h> |
| 39 | #include <linux/hrtimer.h> | 39 | #include <linux/hrtimer.h> |
| 40 | #include <linux/oom.h> | 40 | #include <linux/oom.h> |
| 41 | 41 | ||