Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorChris Mason <clm@fb.com>
Mon, 11 Jan 2016 14:08:37 +0000 (06:08 -0800)
committerChris Mason <clm@fb.com>
Mon, 11 Jan 2016 14:08:37 +0000 (06:08 -0800)
commitb28cf57246d5b797ba725bb033110c247f2c301f
tree33dbe2cfcafa6e7f5b3047a669e454739839f3c7
parenta3058101c17d2825f34a0ab5c37d93ead0f4d9dc
parenta7ca42256d9fad572fb7f2c471514d7d3572b1db
Merge branch 'misc-cleanups-4.5' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5

Signed-off-by: Chris Mason <clm@fb.com>
17 files changed:
fs/btrfs/ctree.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/disk-io.h
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode-map.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/scrub.c
fs/btrfs/super.c
fs/btrfs/tests/extent-io-tests.c
fs/btrfs/tests/free-space-tests.c
fs/btrfs/transaction.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h