]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
Merge branch 'tlb/asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
authorPeter Zijlstra <peterz@infradead.org>
Tue, 9 Oct 2018 14:50:43 +0000 (16:50 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Tue, 9 Oct 2018 14:50:43 +0000 (16:50 +0200)
Pull in the generic mmu_gather changes from the ARM64 tree such that we
can put x86 specific things on top as well.

1  2 
MAINTAINERS
mm/Makefile

diff --cc MAINTAINERS
Simple merge
diff --cc mm/Makefile
Simple merge