Merge branch 'dev-replace-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel...
authorChris Mason <clm@fb.com>
Thu, 2 Jun 2016 00:03:50 +0000 (17:03 -0700)
committerChris Mason <clm@fb.com>
Thu, 2 Jun 2016 00:03:50 +0000 (17:03 -0700)

Trivial merge