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

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 56fa9d0 0584f71)

author	Chris Mason <clm@fb.com>
	Thu, 22 Oct 2015 02:00:38 +0000 (19:00 -0700)
committer	Chris Mason <clm@fb.com>
	Thu, 22 Oct 2015 02:00:38 +0000 (19:00 -0700)
commit	a9e6d153563d2ed69c6cd7fb4fa5ce4ca7c712eb
tree	43fab2a259934e1f1dde9607610424d6089dba5e	tree \| snapshot
parent	56fa9d0762ed17153c1bdff3c0aeeecbe522b504	commit \| diff
parent	0584f718ed1f351fca5047a4b1ebba9b5ea41215	commit \| diff

Merge branch 'allocator-fixes' into for-linus-4.4

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

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