Merge branch 'x86/mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into...
authorWill Deacon <will.deacon@arm.com>
Fri, 6 Jul 2018 12:15:06 +0000 (13:15 +0100)
committerWill Deacon <will.deacon@arm.com>
Fri, 6 Jul 2018 12:15:06 +0000 (13:15 +0100)
commitf3551520416978111b422b7c177f6f1f6d75ff62
tree8ffb520116aab94ea6db75176a946d62e34efc83
parent693350a7998018391852c48f68956cf0f855b2b9
parent5e0fb5df2ee871b841f96f9cb6a7f2784e96aa4e
Merge branch 'x86/mm' of git://git./linux/kernel/git/tip/tip into aarch64/for-next/core

Pull in core ioremap changes from -tip, since we depend on these for
re-enabling huge I/O mappings on arm64.

Signed-off-by: Will Deacon <will.deacon@arm.com>