]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
projects / mirror_ubuntu-zesty-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0965537 16cdcec)
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
tree71da6844bb03c940c87c01a2a1f8c2e11cf85238tree
parent0965537308ac3b267ea16e731bd73870a51c53b8commit | diff
parent16cdcec736cd214350cdb591bf1091f8beedefa0commit | diff
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 diff1 | diff2 | blob | history
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history
fs/btrfs/tree-log.c diff1 | diff2 | blob | history
ubuntu-zesty-kernel mirror