diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-22 13:07:01 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-22 13:07:01 +0200 |
| commit | dcc6d073225b6b732a52477c91bd4edc9b4d5502 (patch) | |
| tree | 71da6844bb03c940c87c01a2a1f8c2e11cf85238 /fs/btrfs/file-item.c | |
| parent | Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_num... (diff) | |
| parent | btrfs: implement delayed inode items operation (diff) | |
| download | linux-dcc6d073225b6b732a52477c91bd4edc9b4d5502.tar.xz linux-dcc6d073225b6b732a52477c91bd4edc9b4d5502.zip | |
Merge branch 'delayed_inode' into inode_numbers
Conflicts:
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file-item.c')
0 files changed, 0 insertions, 0 deletions