Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / external / fio / 49758e11f3658686ccd1c61724a5eba142f3ee4f
commit49758e11f3658686ccd1c61724a5eba142f3ee4f[log] [tgz]
authorJens Axboe <axboe@kernel.dk>Mon Dec 03 14:37:23 2012 +0100
committerJens Axboe <axboe@kernel.dk>Mon Dec 03 14:37:23 2012 +0100
treecc63995cb48b85873f7798230fa856988cdaaeb1
parent7956f141c058cdd95f14491ee646b7f7951ab2ab [diff]
parenta7f5831f1feafbaa41a558028226b517734c54a0 [diff]
Merge branch 'master' into gfio

Conflicts:
	Makefile
	fio.h
	io_u.c
	ioengine.h
	memory.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
tree: cc63995cb48b85873f7798230fa856988cdaaeb1
  1. arch/
  2. compiler/
  3. crc/
  4. engines/
  5. examples/
  6. lib/
  7. os/
  8. profiles/
  9. t/
  10. .gitignore
  11. backend.c
  12. blktrace.c
  13. blktrace_api.h
  14. cairo_text_helpers.c
  15. cairo_text_helpers.h
  16. cconv.c
  17. cgroup.c
  18. cgroup.h
  19. client.c
  20. client.h
  21. COPYING
  22. debug.c
  23. debug.h
  24. diskutil.c
  25. diskutil.h
  26. eta.c
  27. fifo.c
  28. fifo.h
  29. file.h
  30. filehash.c
  31. filehash.h
  32. filesetup.c
  33. FIO-VERSION-GEN
  34. fio.1
  35. fio.c
  36. fio.h
  37. fio_generate_plots
  38. fio_generate_plots.1
  39. flist.h
  40. flow.c
  41. flow.h
  42. gclient.c
  43. gclient.h
  44. gcompat.c
  45. gcompat.h
  46. gerror.c
  47. gerror.h
  48. gettime-thread.c
  49. gettime.c
  50. gettime.h
  51. GFIO-TODO
  52. gfio.c
  53. gfio.h
  54. ghelpers.c
  55. ghelpers.h
  56. goptions.c
  57. goptions.h
  58. graph.c
  59. graph.h
  60. hash.h
  61. helpers.c
  62. helpers.h
  63. HOWTO
  64. init.c
  65. io_ddir.h
  66. io_u.c
  67. ioengine.h
  68. ioengines.c
  69. iolog.c
  70. iolog.h
  71. json.c
  72. json.h
  73. libfio.c
  74. LICENSE
  75. log.c
  76. log.h
  77. Makefile
  78. memalign.c
  79. memalign.h
  80. memory.c
  81. minmax.h
  82. mutex.c
  83. mutex.h
  84. options.c
  85. options.h
  86. parse.c
  87. parse.h
  88. printing.c
  89. printing.h
  90. profile.c
  91. profile.h
  92. README
  93. REPORTING-BUGS
  94. SERVER-TODO
  95. server.c
  96. server.h
  97. smalloc.c
  98. smalloc.h
  99. stat.c
  100. stat.h
  101. thread_options.h
  102. tickmarks.c
  103. tickmarks.h
  104. time.c
  105. time.h
  106. trim.c
  107. trim.h
  108. verify.c
  109. verify.h