Merge branch 'gfio' into gfio-int

Conflicts:
	backend.c
	fio.c
	fio.h
	init.c
	libfio.c
	options.c
	thread_options.h

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

diff --cc backend.c
Simple merge

diff --cc fio.h
index 504d7d1c415db0937c440f18a9874b8244c096be,c8c8b7abdd46db6e4743b2262f9047bffc7cceed..7d478a33b6a4299809691ccfa9e9db543947a072
--- 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"

diff --cc thread_options.h
Simple merge