tree a0b549c57fa72686b9d05e7ee3440fa5c70902d6
parent 3e67c0987d7567ad666641164a153dca9a43b11d
author Jens Axboe <jens.axboe@oracle.com> 1166732401 +0100
committer Linus Torvalds <torvalds@woody.osdl.org> 1166767264 -0800

[PATCH] elevator: fixup typo in merge logic

The recent io scheduler allow_merge commit left the block layer with
no merging, oops. This patch fixes that up.

That means the CFQ change needs to be verified again, it might not fix
the original bug now.  But that's a seperate thing, I'll double check
that tomorrow.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>