]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcc398f5dc8755771a0df8a85bbe5943ac89cb84b
tree46ef48fd4ee47753d6539b65c8a90a2f64e9f8a5
parentae7ce1f433e7554abda22b607f7f0f6fef33142a
parentdde95eeb7d8704f29f1f9e0553159dcc71bbbf2a
Merge branch 'btrfs-3.0' into for-linus
fs/btrfs/inode.c
fs/btrfs/ioctl.c