Merge branch 'cleanup/misc-simplify' of git://git.kernel.org/pub/scm/linux/kernel...
commitafa427cf9d6ef64e73df68882cbabde0e6a61639
authorChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:10:26 +0000 (23 13:10 -0800)
committerChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:10:26 +0000 (23 13:10 -0800)
treede7f14f859f1dd6bbb7c66adfb138f8feaf87f65
parent4ef7675344d687a0ef5b0d7c0cee12da005870c0
parent35de6db28f260e88e9acc47305f7b3f272d76cbf
Merge branch 'cleanup/misc-simplify' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h