projects / fio.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 62232d0) | patch
Fix merge error
authorJens Axboe <axboe@kernel.dk>
Fri, 5 Apr 2013 10:54:03 +0000 (12:54 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 5 Apr 2013 10:54:03 +0000 (12:54 +0200)
commitea783f87082e59a511c4d720d287e0de9fccb1b5
tree1bd0866676a1eb32438a36c5d2a17f4524b35e0dtree | snapshot
parent62232d0618e3f5aa4805b4be34e872895ba1beb2commit | diff
Fix merge error

Fails link because we attempt to link in fio.o twice.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Makefile diff | blob | blame | history
fio - Flexible IO Tester