Merge branch 'sh/ioremap-fixed'