From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 22 Jan 2008 09:36:38 +0000 (+0100)
Subject: Merge branch 'cfq-ioc-share' into syslet-share
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=refs%2Fheads%2Fsyslet-share;p=linux-2.6-block.git

Merge branch 'cfq-ioc-share' into syslet-share

Conflicts:

	kernel/fork.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

ac55aafb1b7c1fe052970a532a06b1273ddfd5ce
diff --cc kernel/fork.c
index 89906fbf085a,e7eec396ae0f..b42f1560c88f
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -51,7 -51,7 +51,8 @@@
  #include <linux/random.h>
  #include <linux/tty.h>
  #include <linux/proc_fs.h>
 +#include <linux/syslet.h>
+ #include <linux/blkdev.h>
  
  #include <asm/pgtable.h>
  #include <asm/pgalloc.h>