Merge branch 'iomem' into release