Merge MTD fixes from 4.0 into -next
authorBrian Norris <computersforpeace@gmail.com>
Wed, 22 Apr 2015 17:29:19 +0000 (10:29 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Wed, 22 Apr 2015 17:29:19 +0000 (10:29 -0700)

Trivial merge