git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8216ef8 e9bb7f1)

author	Chris Mason <chris.mason@oracle.com>
	Fri, 29 Oct 2010 13:27:49 +0000 (09:27 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Fri, 29 Oct 2010 13:27:49 +0000 (09:27 -0400)
commit	6b5b817f103450444f3f658a498f435d92a197e5
tree	2896588127c4dd6c2867ef09e7e3cdd83391f8ae	tree \| snapshot
parent	8216ef866df1119fd5a72372b8b29bce49c18590	commit \| diff
parent	e9bb7f10d3617304ef94ff7aa8fefbce3078f08b	commit \| diff

Merge branch 'bug-fixes' of git://git./linux/kernel/git/josef/btrfs-work

Conflicts:
fs/btrfs/extent-tree.c

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

fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/relocation.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree