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: 106cc69 63af5e6)

author	Chris Mason <chris.mason@oracle.com>
	Mon, 23 May 2011 18:37:47 +0000 (14:37 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Mon, 23 May 2011 18:37:47 +0000 (14:37 -0400)
commit	dbf3723f9b4b587ea153027b36f961d47575d1bd
tree	167a97ac58c7a2fbf7c4e94b6abbfe1e03af014a	tree \| snapshot
parent	106cc69f2b9c1e6d537096cb382f68e974c68fa1	commit \| diff
parent	63af5e6042297e4415899ca6e20ca1ee9bec6856	commit \| diff

Merge branch 'cleanups_and_fixes' into inode_numbers

Conflicts:
fs/btrfs/tree-log.c
fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

14 files changed:

fs/btrfs/ctree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/dir-item.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file-item.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/root-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tree-log.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.