Merge MTD 4.2-rc fixes into MTD -next