Merge branch 'for-chris-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmana...
authorChris Mason <clm@fb.com>
Thu, 27 Apr 2017 21:13:09 +0000 (14:13 -0700)
committerChris Mason <clm@fb.com>
Thu, 27 Apr 2017 21:13:09 +0000 (14:13 -0700)
commitbce19f9d232b71c4eef9ca7d0947035bbb922cef
tree58a8041a2964a0d9ae190d95828db54737220b2c
parentc2a9c7ab475bc3aaf06521a39ac65bc48c8cad4f
parenta7e3b975a0f9296162b72ac6ab7fad9631a07630
Merge branch 'for-chris-4.12' of git://git./linux/kernel/git/fdmanana/linux into for-linus-4.12
fs/btrfs/extent_io.h
fs/btrfs/file.c
fs/btrfs/inode.c