Merge branch 'master' into gfio

Conflicts:
	configure
	fio.c
	init.c

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

diff --cc Makefile
Simple merge

diff --cc backend.c
Simple merge

diff --cc configure
Simple merge

diff --cc init.c
index ce699dfcd6ca07caf7748664ef502eec2dd97423,4709ff29146292a41b6994b450b68730ce8a3032..8ec1eb978e90910620452c34015ec1a42923fa55
--- 1/init.c
--- 2/init.c
+++ b/init.c
@@@ -40,7 -40,8 +40,7 @@@ struct thread_data *threads = NULL
  
  int exitall_on_terminate = 0;
  int output_format = FIO_OUTPUT_NORMAL;
- int eta_print;
+ int eta_print = FIO_ETA_AUTO;
 -unsigned long long mlock_size = 0;
  FILE *f_out = NULL;
  FILE *f_err = NULL;
  char **job_sections = NULL;

diff --cc iolog.c
Simple merge