Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / external / fio / fddc6604f91ebf76d9090741f9d4f5a4d33be0c6
commitfddc6604f91ebf76d9090741f9d4f5a4d33be0c6[log] [tgz]
authorJens Axboe <axboe@kernel.dk>Wed Oct 12 09:47:25 2011 +0200
committerJens Axboe <axboe@kernel.dk>Wed Oct 12 09:47:25 2011 +0200
treed8e2498b878c7d96f6949e1ed7b4069923bb4f01
parentb814fb2694fe178b5cb94e046b9d31944e752f4a [diff]
parent15b87723551b424d0db4c53577b567e670c7d4d8 [diff]
Merge branch 'master' into client-server

Conflicts:
	init.c
	io_u.c
	os/windows/install.wxs
	os/windows/version.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
tree: d8e2498b878c7d96f6949e1ed7b4069923bb4f01
  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. fio_version.h
  34. flist.h
  35. gettime.c
  36. hash.h
  37. helpers.c
  38. helpers.h
  39. HOWTO
  40. ieee754.c
  41. ieee754.h
  42. init.c
  43. io_ddir.h
  44. io_u.c
  45. ioengine.h
  46. ioengines.c
  47. iolog.c
  48. iolog.h
  49. log.c
  50. log.h
  51. Makefile
  52. memalign.c
  53. memalign.h
  54. memory.c
  55. mutex.c
  56. mutex.h
  57. options.c
  58. options.h
  59. parse.c
  60. parse.h
  61. profile.c
  62. profile.h
  63. rbtree.c
  64. rbtree.h
  65. README
  66. REPORTING-BUGS
  67. SERVER-TODO
  68. server.c
  69. server.h
  70. smalloc.c
  71. smalloc.h
  72. stat.c
  73. stat.h
  74. time.c
  75. time.h
  76. trim.c
  77. trim.h
  78. verify.c
  79. verify.h