Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / external / fio / 836fcc0fceb233ebcc41ee63b4ea5cae20b678a4
commit836fcc0fceb233ebcc41ee63b4ea5cae20b678a4[log] [tgz]
authorJens Axboe <axboe@kernel.dk>Thu Jan 24 09:08:45 2013 -0700
committerJens Axboe <axboe@kernel.dk>Thu Jan 24 09:08:45 2013 -0700
treeba33bc3088166274d603105a9e957fda8fa7c013
parent4aaefbfa2b7a7a70ff6c6851dc3cee01b5993149 [diff]
parent798827c895a585f284842f6b99378be19c821263 [diff]
Merge branch 'master' into gfio

Conflicts:
	Makefile
	backend.c
	client.c
	fio.c
	fio.h
	ioengine.h
	options.c
	os/os-linux.h
	server.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
tree: ba33bc3088166274d603105a9e957fda8fa7c013
  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. configure
  22. COPYING
  23. debug.c
  24. debug.h
  25. diskutil.c
  26. diskutil.h
  27. eta.c
  28. fifo.c
  29. fifo.h
  30. file.h
  31. filehash.c
  32. filehash.h
  33. filesetup.c
  34. FIO-VERSION-GEN
  35. fio.1
  36. fio.c
  37. fio.h
  38. fio_generate_plots
  39. fio_generate_plots.1
  40. flist.h
  41. flow.c
  42. flow.h
  43. gclient.c
  44. gclient.h
  45. gcompat.c
  46. gcompat.h
  47. gerror.c
  48. gerror.h
  49. gettime-thread.c
  50. gettime.c
  51. gettime.h
  52. GFIO-TODO
  53. gfio.c
  54. gfio.h
  55. ghelpers.c
  56. ghelpers.h
  57. goptions.c
  58. goptions.h
  59. graph.c
  60. graph.h
  61. hash.h
  62. helpers.c
  63. helpers.h
  64. HOWTO
  65. init.c
  66. io_ddir.h
  67. io_u.c
  68. ioengine.h
  69. ioengines.c
  70. iolog.c
  71. iolog.h
  72. json.c
  73. json.h
  74. libfio.c
  75. LICENSE
  76. log.c
  77. log.h
  78. Makefile
  79. memalign.c
  80. memalign.h
  81. memory.c
  82. minmax.h
  83. mutex.c
  84. mutex.h
  85. options.c
  86. options.h
  87. parse.c
  88. parse.h
  89. printing.c
  90. printing.h
  91. profile.c
  92. profile.h
  93. README
  94. REPORTING-BUGS
  95. SERVER-TODO
  96. server.c
  97. server.h
  98. smalloc.c
  99. smalloc.h
  100. stat.c
  101. stat.h
  102. thread_options.h
  103. tickmarks.c
  104. tickmarks.h
  105. time.c
  106. time.h
  107. trim.c
  108. trim.h
  109. verify.c
  110. verify.h