git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b8221e)
block: fixup for generic bio chaining
authorKent Overstreet <kmo@daterainc.com>
Tue, 3 Dec 2013 21:24:08 +0000 (13:24 -0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 3 Dec 2013 21:30:00 +0000 (14:30 -0700)
btrfs bits got lost in the rebase

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Chris Mason <clm@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/btrfs/disk-io.c patch | blob | history
fs/btrfs/volumes.c patch | blob | history

diff --cc fs/btrfs/disk-io.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge
Pandora Kernel Repository