Merge branch 'cfq-ioc-share' into syslet-share syslet-share
authorJens Axboe <jens.axboe@oracle.com>
Tue, 22 Jan 2008 09:36:38 +0000 (10:36 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 22 Jan 2008 09:36:38 +0000 (10:36 +0100)
commitac55aafb1b7c1fe052970a532a06b1273ddfd5ce
tree5b1de79e98ba59a8f592e66b2da4153a29e15281
parent60bf539298068f9f5d214f21d3860c6313e5bdfd
parent79a772c96af1c5751888e4476b9b6d45bcef137e
Merge branch 'cfq-ioc-share' into syslet-share

Conflicts:

kernel/fork.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
include/linux/sched.h
kernel/fork.c