Merge MTD pullreq from 3.15-rc5

This commit is contained in:
Brian Norris 2014-06-10 23:21:12 -07:00
commit f1900c7963

Diff content is not available