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

Conflicts:

	kernel/fork.c

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

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/fork.c
index 89906fbf085aa27067ebe1abbdecbe954d80b948,e7eec396ae0f3cca46bb2e85733ae452dd682b97..b42f1560c88ff1f678797db429d0f20921adfa29
--- 1/kernel/fork.c
--- 2/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>