git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bbf65cf 4d75f8a)

author	Chris Mason <clm@fb.com>
	Sat, 4 Oct 2014 16:57:14 +0000 (09:57 -0700)
committer	Chris Mason <clm@fb.com>
	Sat, 4 Oct 2014 16:57:14 +0000 (09:57 -0700)
commit	27b19cc8864e206c4203041892b0f706f044a0f1
tree	f724dd77efa379da881fba7f46075af17a728bf9	tree \| snapshot
parent	bbf65cf0b5b67843ca094df01019222b85af2183	commit \| diff
parent	4d75f8a9c87b843c8ded15b82b8d137b9724cccc	commit \| diff

Merge branch 'cleanup/blocksize-diet-part1' of git://git./linux/kernel/git/kdave/linux into for-linus

fs/btrfs/ctree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	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/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/relocation.c	diff1 \|	diff2 \|	blob \| history

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