Merge branches 'cns3xxx/fixes', 'omap/fixes' and 'davinci/fixes' into fixes