projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64e0550 19a39dc)
Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration
authorChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:26:02 +0000 (15:26 -0500)
committerChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:26:02 +0000 (15:26 -0500)
1  2 
fs/btrfs/disk-io.c patch | diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c patch | diff1 | diff2 | blob | history
fs/btrfs/super.c patch | diff1 | diff2 | blob | history
fs/btrfs/volumes.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/disk-io.c
Simple merge
diff --cc fs/btrfs/extent-tree.c
Simple merge
diff --cc fs/btrfs/super.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge
Domain: System / Kernel;