git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4920d7d fc9b8c6)

author	Chris Mason <clm@fb.com>
	Fri, 18 Dec 2015 19:11:10 +0000 (11:11 -0800)
committer	Chris Mason <clm@fb.com>
	Fri, 18 Dec 2015 19:11:10 +0000 (11:11 -0800)
commit	9de896bc204291fa8b39e97ec3d77260012a0f0b
tree	2ad3d4d98af789fd807795a9683ce4904b3c4182	tree \| snapshot
parent	4920d7d57f4b89e6c9ef52a8cf08c2582dcfa7a7	commit \| diff
parent	fc9b8c6e9fd47b2bbd0d57e888eb7a423d6a4a8d	commit \| diff

Merge branch 'freespace-tree' into for-linus-4.5

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

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/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tests/btrfs-tests.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tests/free-space-tests.c	diff1 \|	diff2 \|	blob \| history
include/trace/events/btrfs.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.