Merge branch 'unified-merge' of https://github.com/jeffreyalien/fio

* 'unified-merge' of https://github.com/jeffreyalien/fio:
  Add functionality to the unified_rw_reporting parameter to output separate and mixed stats when set to 'both' or 2.

diff --cc HOWTO
Simple merge

diff --cc eta.c
Simple merge

diff --cc fio.1
Simple merge

diff --cc options.c
Simple merge

diff --cc stat.c
Simple merge