Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / external / fio / d5e3a0c6f5376e0d76143edb2c1622efd77f995f
commitd5e3a0c6f5376e0d76143edb2c1622efd77f995f[log] [tgz]
authorJens Axboe <axboe@kernel.dk>Wed Oct 05 09:55:28 2011 +0200
committerJens Axboe <axboe@kernel.dk>Wed Oct 05 09:55:28 2011 +0200
tree98e92a24a8ed58e8f56a8d900050cd6f12ad2190
parent802ad4a83e92a30b5fdccf117d59fbb69068c054 [diff]
parent8c029376bbe6d8a6bcb01c3ef7d545720aca3868 [diff]
Merge branch 'master' into client-server

Conflicts:
	init.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
tree: 98e92a24a8ed58e8f56a8d900050cd6f12ad2190
  1. arch/
  2. compiler/
  3. crc/
  4. engines/
  5. examples/
  6. lib/
  7. os/
  8. profiles/
  9. t/
  10. .gitignore
  11. blktrace.c
  12. blktrace_api.h
  13. cgroup.c
  14. cgroup.h
  15. client.c
  16. COPYING
  17. debug.c
  18. debug.h
  19. diskutil.c
  20. diskutil.h
  21. eta.c
  22. fifo.c
  23. fifo.h
  24. file.h
  25. filehash.c
  26. filehash.h
  27. filesetup.c
  28. fio.1
  29. fio.c
  30. fio.h
  31. fio_generate_plots
  32. fio_generate_plots.1
  33. flist.h
  34. gettime.c
  35. hash.h
  36. helpers.c
  37. helpers.h
  38. HOWTO
  39. ieee754.c
  40. ieee754.h
  41. init.c
  42. io_ddir.h
  43. io_u.c
  44. ioengine.h
  45. ioengines.c
  46. iolog.c
  47. iolog.h
  48. log.c
  49. log.h
  50. Makefile
  51. memalign.c
  52. memalign.h
  53. memory.c
  54. mutex.c
  55. mutex.h
  56. options.c
  57. options.h
  58. parse.c
  59. parse.h
  60. profile.c
  61. profile.h
  62. rbtree.c
  63. rbtree.h
  64. README
  65. REPORTING-BUGS
  66. SERVER-TODO
  67. server.c
  68. server.h
  69. smalloc.c
  70. smalloc.h
  71. stat.c
  72. stat.h
  73. time.c
  74. time.h
  75. trim.c
  76. trim.h
  77. verify.c
  78. verify.h