aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-03 09:11:13 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-03 09:11:13 +0100
commit36609469c8278554b046aa4cc9a5fa9ccea35306 (patch)
treef59185b71c8059941de79143f71178453599b8f1 /init
parentb3acf29afda06c76774dc6df6246c37ae707836b (diff)
parent45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff)
downloadmrst-s0i3-test-36609469c8278554b046aa4cc9a5fa9ccea35306.tar.gz
mrst-s0i3-test-36609469c8278554b046aa4cc9a5fa9ccea35306.tar.xz
mrst-s0i3-test-36609469c8278554b046aa4cc9a5fa9ccea35306.zip
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts_md.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index 4d42f450b59..d6da5cdd3c3 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -1,6 +1,5 @@
#include <linux/delay.h>
#include <linux/raid/md.h>
-#include <linux/delay.h>
#include "do_mounts.h"