diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /lib/fault-inject.c | |
| parent | 889c92d21db40be0b7d22a59395060237895bb85 (diff) | |
| parent | 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 (diff) | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'lib/fault-inject.c')
| -rw-r--r-- | lib/fault-inject.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index a50a311554cc..f97af55bdd96 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/fs.h> | 6 | #include <linux/fs.h> |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
| 9 | #include <linux/unwind.h> | ||
| 10 | #include <linux/stacktrace.h> | 9 | #include <linux/stacktrace.h> |
| 11 | #include <linux/kallsyms.h> | 10 | #include <linux/kallsyms.h> |
| 12 | #include <linux/fault-inject.h> | 11 | #include <linux/fault-inject.h> |