Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanan...
authorChris Mason <clm@fb.com>
Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
committerChris Mason <clm@fb.com>
Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
commit988f1f576d4f7531cb2175ee1b7cb7afd6d95d22
treebd7d676abc4b13b749d3ad6cb41e7872a6fdfb2f
parentb28cf57246d5b797ba725bb033110c247f2c301f
parent8cdc7c5b00d945a3c823fc4277af304abb9cb43d
Merge branch 'for-chris-4.5' of git://git./linux/kernel/git/fdmanana/linux into for-linus-4.5

Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c