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)
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>

Trivial merge