commit | f3551520416978111b422b7c177f6f1f6d75ff62 | [log] [tgz] |
---|---|---|
author | Will Deacon <will.deacon@arm.com> | Fri Jul 06 13:15:06 2018 +0100 |
committer | Will Deacon <will.deacon@arm.com> | Fri Jul 06 13:15:06 2018 +0100 |
tree | 8ffb520116aab94ea6db75176a946d62e34efc83 | |
parent | 693350a7998018391852c48f68956cf0f855b2b9 [diff] | |
parent | 5e0fb5df2ee871b841f96f9cb6a7f2784e96aa4e [diff] |
Merge branch 'x86/mm' of git://git.kernel.org/pub/scm/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>