Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2