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)
commitc05c5ee5ea40fe40df5e29471f583a0eb7c531e3
treec56a3336bf631d9e97f038f1253e8e99726eb3e5
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af
parentf5bc27c71a1b0741cb93dbec0f216b012b21d93f
Merge tag 'for-chris' of git://git./linux/kernel/git/kdave/linux into for-linus-4.6

Btrfs patchsets for 4.6
fs/btrfs/inode.c