git.maquefel.me Git - linux.git/commit

author	Chris Mason <chris.mason@oracle.com>
	Sun, 22 May 2011 16:33:42 +0000 (12:33 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Sun, 22 May 2011 16:33:42 +0000 (12:33 -0400)
commit	945d8962ceee6bb273365d0bdf42f763225b290f
tree	43f5617022c7c947c3c63664e49eb9575ab82f2f	tree \| snapshot
parent	0d0ca30f180906224be6279788f2b202cfd959d8	commit \| diff
parent	4ea028859bbdad34b84c9951fbb832ae10c6a96c	commit \| diff

Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers

Conflicts:
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c

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

23 files changed:

fs/btrfs/acl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/compression.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/delayed-inode.c	diff1 \|	\|	blob \| history
fs/btrfs/dir-item.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.h	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/file.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/free-space-cache.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode-map.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/relocation.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/sysfs.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tree-log.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/xattr.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

fs/btrfs/acl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/compression.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/delayed-inode.c	diff1 \|	\|	blob \| history
fs/btrfs/dir-item.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.h	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/file.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/free-space-cache.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode-map.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/relocation.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/sysfs.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tree-log.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/xattr.c	diff1 \|	diff2 \|	blob \| history