Merge branches 'fixes' and 'ioremap' into for-linus