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

diff --combined fio.h
index 2e51da3bd76974c2473eac8500d249abf40d3155,5bb5569584cc289d49bb9afd9831ba05bd98d0ee..b94bf4313081bfed79fbed4ff8b67274a134ad83
--- 1/fio.h
--- 2/fio.h
+++ b/fio.h
@@@ -10,7 -10,6 +10,7 @@@
  #include <stdlib.h>
  #include <stdio.h>
  #include <unistd.h>
 +#include <string.h>
  
  #include "list.h"
  #include "md5.h"
@@@ -460,6 -459,7 +460,7 @@@ extern unsigned long mtime_since_genesi
  extern void __usec_sleep(unsigned int);
  extern void usec_sleep(struct thread_data *, unsigned long);
  extern void rate_throttle(struct thread_data *, unsigned long, unsigned int, int);
+ extern void fill_start_time(struct timeval *);
  
  /*
   * Init functions