Merge branch 'master' into gfio

Conflicts:
	Makefile
	configure
	fio.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/thread_options.h b/thread_options.h
index 11e7af7..a28ccfe 100644
--- a/thread_options.h
+++ b/thread_options.h
@@ -197,6 +197,7 @@
 	unsigned int trim_zero;
 	unsigned long long trim_backlog;
 	unsigned int clat_percentiles;
+	unsigned int percentile_precision;	/* digits after decimal for percentiles */
 	fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
 	char *read_iolog_file;
@@ -396,6 +397,7 @@
 	uint32_t trim_zero;
 	uint64_t trim_backlog;
 	uint32_t clat_percentiles;
+	uint32_t percentile_precision;
 	fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
 	uint8_t read_iolog_file[FIO_TOP_STR_MAX];