Merge branch 'kdave-v4.8' into for-linus-4.8
authorChris Mason <clm@fb.com>
Tue, 26 Jul 2016 20:07:05 +0000 (13:07 -0700)
committerChris Mason <clm@fb.com>
Tue, 26 Jul 2016 20:07:05 +0000 (13:07 -0700)

Trivial merge