tree 415e0ee0e6cd28e7c5d8d8bace91ad213678704a
parent b0df7176176935b4d39fd196ad35f046bbe10333
parent c857cfebb50209b950cbc88b4f74714fdf5be75f
author Jens Axboe <axboe@kernel.dk> 1333637911 -0600
committer Jens Axboe <axboe@kernel.dk> 1333637911 -0600

Merge branch 'master' into gfio

Conflicts:
	fio.c
	fio.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>