Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux...
authorChris Mason <clm@fb.com>
Wed, 7 Sep 2016 19:55:36 +0000 (12:55 -0700)
committerChris Mason <clm@fb.com>
Wed, 7 Sep 2016 19:55:36 +0000 (12:55 -0700)

Trivial merge