projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6fd41e dde820f)
Merge branch 'btrfs-3.0' into for-linus
authorChris Mason <chris.mason@oracle.com>
Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)
committerChris Mason <chris.mason@oracle.com>
Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)
1  2 
fs/btrfs/inode.c patch | diff1 | diff2 | blob | history
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
Domain: System / Uncategorized;