Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Fri, 24 Feb 2012 07:28:55 +0000 (08:28 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 24 Feb 2012 07:28:55 +0000 (08:28 +0100)

Trivial merge