Merge branch 'ioremap' into release-2.6.27