projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d4284b 213e64d)
Merge branch 'for-chris' of git://github.com/idryomov/btrfs-unstable into for-linus
authorChris Mason <chris.mason@oracle.com>
Thu, 29 Mar 2012 00:32:46 +0000 (20:32 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 29 Mar 2012 00:32:46 +0000 (20:32 -0400)
1  2 
fs/btrfs/ctree.h patch | diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c patch | diff1 | diff2 | blob | history
fs/btrfs/volumes.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/ctree.h
Simple merge
diff --cc fs/btrfs/extent-tree.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge
Domain: System / Uncategorized;