Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 15 Nov 2012 20:57:29 +0000 (13:57 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 15 Nov 2012 20:57:29 +0000 (13:57 -0700)
commit7956f141c058cdd95f14491ee646b7f7951ab2ab
treea7d4855dad70801861e5bf6950311e5975708a52
parent559cf11ad6d52bba25c5402d2dc66b54a68b11e3
parent355934b7ed82d13a5bfc043e2243013fd1e4e5bd
Merge branch 'master' into gfio

Conflicts:
libfio.c
server.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>