diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:46:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:47:05 -0400 |
| commit | e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a (patch) | |
| tree | 4ba588631dd8189a818a91c9e3976526071178b6 /drivers/char/sysrq.c | |
| parent | 1130b0296184bc21806225fd06d533515a99d2db (diff) | |
| parent | 56a50adda49b2020156616c4eb15353e0f9ad7de (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/sysrq.c')
| -rw-r--r-- | drivers/char/sysrq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 0540d5de2c17..aed2b2936ecf 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/vt_kern.h> | 36 | #include <linux/vt_kern.h> |
| 37 | #include <linux/workqueue.h> | 37 | #include <linux/workqueue.h> |
| 38 | #include <linux/kexec.h> | 38 | #include <linux/kexec.h> |
| 39 | #include <linux/interrupt.h> | ||
| 40 | #include <linux/hrtimer.h> | 39 | #include <linux/hrtimer.h> |
| 41 | #include <linux/oom.h> | 40 | #include <linux/oom.h> |
| 42 | 41 | ||