git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 61c4f2c 82d5902)

author	Chris Mason <chris.mason@oracle.com>
	Sat, 21 May 2011 13:27:38 +0000 (09:27 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Sat, 21 May 2011 13:27:38 +0000 (09:27 -0400)
commit	0965537308ac3b267ea16e731bd73870a51c53b8
tree	7b52288b7272b2391f736dd82a313cbbaad68570	tree
parent	61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf	commit \| diff
parent	82d5902d9c681be37ffa9d70482907f9f0b7ec1f	commit \| diff

Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_numbers

Conflicts:
fs/btrfs/free-space-cache.c

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

fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/export.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/free-space-cache.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/tree-log.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/xattr.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.