Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 5 Apr 2012 14:58:31 +0000 (08:58 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 5 Apr 2012 14:58:31 +0000 (08:58 -0600)
commit61b29c20eb4b1d374636d5325fb56c0fa9a574ad
tree415e0ee0e6cd28e7c5d8d8bace91ad213678704a
parentb0df7176176935b4d39fd196ad35f046bbe10333
parentc857cfebb50209b950cbc88b4f74714fdf5be75f
Merge branch 'master' into gfio

Conflicts:
fio.c
fio.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
HOWTO
fio.h
iolog.c
libfio.c
stat.c