Merge MTD 4.2-rc fixes into MTD -next
authorBrian Norris <computersforpeace@gmail.com>
Tue, 7 Jul 2015 20:10:30 +0000 (13:10 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 7 Jul 2015 20:10:30 +0000 (13:10 -0700)

Trivial merge