Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux...
authorChris Mason <clm@fb.com>
Fri, 10 Feb 2017 20:53:18 +0000 (12:53 -0800)
committerChris Mason <clm@fb.com>
Fri, 10 Feb 2017 20:53:18 +0000 (12:53 -0800)

Trivial merge