Merge MTD fixes from 4.0 into -next
authorBrian Norris <[email protected]>
Wed, 22 Apr 2015 17:29:19 +0000 (10:29 -0700)
committerBrian Norris <[email protected]>
Wed, 22 Apr 2015 17:29:19 +0000 (10:29 -0700)

Trivial merge