Merge tag 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux...
authorChris Mason <clm@fb.com>
Tue, 1 Mar 2016 16:13:56 +0000 (08:13 -0800)
committerChris Mason <clm@fb.com>
Tue, 1 Mar 2016 16:13:56 +0000 (08:13 -0800)
Btrfs patchsets for 4.6

1  2 
fs/btrfs/inode.c

Simple merge