Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorAndreas Gruenbacher <agruenba@redhat.com>
Mon, 16 Oct 2017 13:06:23 +0000 (15:06 +0200)
committerAndreas Gruenbacher <agruenba@redhat.com>
Mon, 16 Oct 2017 13:06:23 +0000 (15:06 +0200)

Trivial merge