Andreas Piesk (1):
      use option smalloc_pool_size

Jens Axboe (32):
      client: rename send_file() to fio_send_file()
      lib/pattern: include oslib/strcasestr.h
      Fix included getopt locations
      t/genzipf: fix for strcasestr missing
      t/dedupe: silence bogus warning on 'bytes' being used uninitialized
      configure: check if lex requires/fails with -o for output
      configure: add --enable-lex
      options: make the groups/categories constant
      options: split out option grouping code
      options: we don't need the crc32c verify include
      options: move pattern_fmt_desc where we need it
      server: include name of verify file requested for error message
      configure: lex force off
      server: sk_out exit error handling
      verify: split out state header code
      verify-state: forward declare io_u
      Merge branch 'master' of git://github.com/ezrapedersen/fio
      t/verify-state: add helper to inspect verify dump state files
      options: fix bs_cmp()
      Always create server sk_out key
      Destroy sk_out server key when we are done
      t/verify-state: fix type for printf
      t/verify-state: one more printf type fix
      io_u: ensure that we align new start offset properly for time_based
      Fix issue with termination before io_size has been reached
      client: drain text output when exiting
      client: fix non-text command leak
      init: increment stat count if parent == default thread
      Fio 2.4
      init: fix compile for FIO_INC_DEBUG not being set
      mutex: fix double unlock in fio_mutex_down_timeout()
      Fio 2.5

root (1):
      Disable libaio for ESXi build - bug#80