Merge MTD updates into -next

This commit is contained in:
Brian Norris 2015-02-28 01:06:08 -08:00
commit adf716d2f3