Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanan...
authorChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -0800)
committerChris Mason <clm@fb.com>
Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -0800)
1  2 
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c

Simple merge
Simple merge
Simple merge