Merge branch 'master' of ssh://router/data/git/fio

Conflicts:

	fio.h

diff --cc README
Simple merge

diff --cc fio-ini.c
Simple merge

diff --cc fio.c
Simple merge

diff --cc fio.h
index a75d3b2d1b6ad08441c0826d513c6a92109551e4,01c8b9baa566fab534ab042a637e62fc6b2d74f9..107f767146d2abc01126e8605fd6910e75e852ff
--- 1/fio.h
--- 2/fio.h
+++ b/fio.h
@@@ -150,12 -150,12 +150,16 @@@ struct thread_data 
        unsigned int iodepth;
        os_cpu_mask_t cpumask;
        unsigned int jobnum;
 +      unsigned int iolog;
+       unsigned int read_iolog;
+       unsigned int write_iolog;
 +      unsigned int rwmixcycle;
 +      unsigned int rwmixread;
 +      unsigned int nice;
  
        char iolog_file[256];
+       void *iolog_buf;
+       FILE *iolog_f;
  
        struct drand48_data bsrange_state;
        struct drand48_data verify_state;