Merge MTD fixes into -next
authorBrian Norris <computersforpeace@gmail.com>
Thu, 1 Jun 2017 18:24:24 +0000 (11:24 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Thu, 1 Jun 2017 18:24:24 +0000 (11:24 -0700)

Trivial merge