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

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a88336d 5f9a8a5)

author	Chris Mason <clm@fb.com>
	Tue, 17 May 2016 21:43:19 +0000 (14:43 -0700)
committer	Chris Mason <clm@fb.com>
	Tue, 17 May 2016 21:43:19 +0000 (14:43 -0700)
commit	c315ef8d9db7f1a0ebd023a395ebdfde1c68057e
tree	501e1fc558de9e56b78e457aa928fa255e660486	tree \| snapshot
parent	a88336d13c66fc171f336c6332fcb67339894e08	commit \| diff
parent	5f9a8a51d8b95505d8de8b7191ae2ed8c504d4af	commit \| diff

Merge branch 'for-chris-4.7' of git://git./linux/kernel/git/fdmanana/linux into for-linus-4.7

Signed-off-by: Chris Mason <clm@fb.com>

fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/dev-replace.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.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/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tree-log.c	diff1 \|	diff2 \|	blob \| history

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