Merge "msm: watchdog: Get the base and irq from platform data" into msm-3.4