Merge branch 'misc-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux...
authorChris Mason <clm@fb.com>
Wed, 6 Apr 2016 23:57:19 +0000 (16:57 -0700)
committerChris Mason <clm@fb.com>
Wed, 6 Apr 2016 23:57:19 +0000 (16:57 -0700)

Trivial merge