Merge pull request #4698 from D-Albers/btrfs-progs-4.12
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 12 Aug 2017 11:32:47 +0000 (14:32 +0300)
committerGitHub <noreply@github.com>
Sat, 12 Aug 2017 11:32:47 +0000 (14:32 +0300)
btrfs-progs: update to 4.12


Trivial merge