Merge branch 'delayed_inode' into inode_numbers
authorChris Mason <chris.mason@oracle.com>
Sun, 22 May 2011 11:07:01 +0000 (07:07 -0400)
committerChris Mason <chris.mason@oracle.com>
Sun, 22 May 2011 11:07:01 +0000 (07:07 -0400)
commitdcc6d073225b6b732a52477c91bd4edc9b4d5502
tree71da6844bb03c940c87c01a2a1f8c2e11cf85238
parent0965537308ac3b267ea16e731bd73870a51c53b8
parent16cdcec736cd214350cdb591bf1091f8beedefa0
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>
fs/btrfs/btrfs_inode.h
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/transaction.c
fs/btrfs/tree-log.c