Merge branch 'misc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorChris Mason <clm@fb.com>
Mon, 11 Jan 2016 13:59:32 +0000 (05:59 -0800)
committerChris Mason <clm@fb.com>
Mon, 11 Jan 2016 13:59:32 +0000 (05:59 -0800)
commita3058101c17d2825f34a0ab5c37d93ead0f4d9dc
tree193417b02c4fa79b582b435e154761b91a501884
parent511711af91f21d80b27f18b569352d6896562828
parentee592d07716139ef7c3ea8049936cbc3aafbc533
Merge branch 'misc-for-4.5' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5
12 files changed:
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/scrub.c
fs/btrfs/super.c
fs/btrfs/tests/free-space-tests.c
fs/btrfs/transaction.c
fs/btrfs/volumes.c
fs/btrfs/xattr.c