Merge branch 'gfio' into gfio-int
authorJens Axboe <axboe@kernel.dk>
Thu, 11 Apr 2013 10:31:29 +0000 (12:31 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 11 Apr 2013 10:31:29 +0000 (12:31 +0200)
Conflicts:
backend.c
fio.c
fio.h
init.c
libfio.c
options.c
thread_options.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
1  2 
backend.c
fio.h
thread_options.h

diff --cc backend.c
Simple merge
diff --cc fio.h
--- 1/fio.h
--- 2/fio.h
+++ b/fio.h
@@@ -36,7 -37,7 +36,8 @@@ struct thread_data
  #include "gettime.h"
  #include "lib/getopt.h"
  #include "lib/rand.h"
 +#include "lib/rbtree.h"
+ #include "client.h"
  #include "server.h"
  #include "stat.h"
  #include "flow.h"
Simple merge