Didn't cause a merge conflict, so fixed this one up manually
post merge.
Signed-off-by: NJens Axboe <jaxboe@fusionio.com>