Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanan...
authorChris Mason <clm@fb.com>
Tue, 17 May 2016 21:43:19 +0000 (14:43 -0700)
committerChris Mason <clm@fb.com>
Tue, 17 May 2016 21:43:19 +0000 (14:43 -0700)
commitc315ef8d9db7f1a0ebd023a395ebdfde1c68057e
tree501e1fc558de9e56b78e457aa928fa255e660486
parenta88336d13c66fc171f336c6332fcb67339894e08
parent5f9a8a51d8b95505d8de8b7191ae2ed8c504d4af
Merge branch 'for-chris-4.7' of git://git./linux/kernel/git/fdmanana/linux into for-linus-4.7

Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/ctree.h
fs/btrfs/dev-replace.c
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/relocation.c
fs/btrfs/super.c
fs/btrfs/transaction.c
fs/btrfs/tree-log.c