git.cascardo.eti.br Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bf8e8ca fccb84c)

author	Chris Mason <clm@fb.com>
	Sat, 4 Oct 2014 16:56:45 +0000 (09:56 -0700)
committer	Chris Mason <clm@fb.com>
	Sat, 4 Oct 2014 16:56:45 +0000 (09:56 -0700)
commit	bbf65cf0b5b67843ca094df01019222b85af2183
tree	35e1a8c54876cc8a105a2ad0230526195d3cafbf	tree \| snapshot
parent	bf8e8ca6fd4ac6e8edc58b92cffb2ffd51933138	commit \| diff
parent	fccb84c94a9755f48668e43d0a44d6ecc750900f	commit \| diff

Merge branch 'cleanup/misc-for-3.18' of git://git./linux/kernel/git/kdave/linux into for-linus

Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/extent_io.c

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/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/relocation.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/send.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history

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