git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6e769fa 30872c3)

author	Chris Mason <chris.mason@oracle.com>
	Sun, 22 May 2011 11:07:01 +0000 (07:07 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Sun, 22 May 2011 11:07:01 +0000 (07:07 -0400)
commit	80b5bc1805489047f4a07d086176a1a86df83ea5
tree	71da6844bb03c940c87c01a2a1f8c2e11cf85238	tree \| snapshot
parent	6e769fa8534e69d50692c67fd5e598d4252b7494	commit \| diff
parent	30872c3c76f307cb91b454e706df08319da631a9	commit \| 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

Linux Kernel Source Tree.