refs/heads/syslet-share - pub/scm/linux/kernel/git/jikos/linux-block

commit: ac55aafb1b7c1fe052970a532a06b1273ddfd5ce
[log] [tgz]
author: Jens Axboe <jens.axboe@oracle.com>
Tue Jan 22 10:36:38 2008 +0100
committer: Jens Axboe <jens.axboe@oracle.com>
Tue Jan 22 10:36:38 2008 +0100
tree: 5b1de79e98ba59a8f592e66b2da4153a29e15281
parent: 60bf539298068f9f5d214f21d3860c6313e5bdfd [diff]
parent: 79a772c96af1c5751888e4476b9b6d45bcef137e [diff]

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

Conflicts:

	kernel/fork.c

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

tree: 5b1de79e98ba59a8f592e66b2da4153a29e15281