Merge "msm: 9625: Add device tree information for NAND" into msm-3.4