]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Fix merge error
authorJens Axboe <axboe@kernel.dk>
Wed, 21 Sep 2011 08:26:58 +0000 (10:26 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 21 Sep 2011 08:26:58 +0000 (10:26 +0200)
commitfea0fa764c69232c6e178a31d5d4adfbde96c201
tree788c24284333d3e8f1bb97d297adbcfee97b7b0e
parent72f5fefd3e7dfb4dbd2e47256248e704d42db3bc
Fix merge error

Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c