Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next
Conflicts: drivers/iommu/Kconfig drivers/iommu/Makefile
No related branches found
No related tags found
Showing
- arch/arm/boot/dts/sun8i-a23.dtsi 0 additions, 9 deletionsarch/arm/boot/dts/sun8i-a23.dtsi
- arch/arm/boot/dts/sun9i-a80-optimus.dts 5 additions, 0 deletionsarch/arm/boot/dts/sun9i-a80-optimus.dts
- arch/arm/boot/dts/sun9i-a80.dtsi 0 additions, 10 deletionsarch/arm/boot/dts/sun9i-a80.dtsi
- arch/arm/include/asm/kvm_emulate.h 10 additions, 0 deletionsarch/arm/include/asm/kvm_emulate.h
- arch/arm/include/asm/kvm_host.h 0 additions, 3 deletionsarch/arm/include/asm/kvm_host.h
- arch/arm/include/asm/kvm_mmu.h 67 additions, 10 deletionsarch/arm/include/asm/kvm_mmu.h
- arch/arm/kvm/arm.c 0 additions, 10 deletionsarch/arm/kvm/arm.c
- arch/arm/kvm/coproc.c 14 additions, 56 deletionsarch/arm/kvm/coproc.c
- arch/arm/kvm/coproc.h 3 additions, 3 deletionsarch/arm/kvm/coproc.h
- arch/arm/kvm/coproc_a15.c 1 addition, 1 deletionarch/arm/kvm/coproc_a15.c
- arch/arm/kvm/coproc_a7.c 1 addition, 1 deletionarch/arm/kvm/coproc_a7.c
- arch/arm/kvm/mmu.c 144 additions, 20 deletionsarch/arm/kvm/mmu.c
- arch/arm/kvm/trace.h 39 additions, 0 deletionsarch/arm/kvm/trace.h
- arch/arm/mach-mvebu/coherency.c 7 additions, 0 deletionsarch/arm/mach-mvebu/coherency.c
- arch/arm/mach-shmobile/board-ape6evm.c 20 additions, 0 deletionsarch/arm/mach-shmobile/board-ape6evm.c
- arch/arm/mach-shmobile/board-lager.c 13 additions, 0 deletionsarch/arm/mach-shmobile/board-lager.c
- arch/arm/mach-shmobile/setup-rcar-gen2.c 2 additions, 0 deletionsarch/arm/mach-shmobile/setup-rcar-gen2.c
- arch/arm/mach-shmobile/timer.c 12 additions, 0 deletionsarch/arm/mach-shmobile/timer.c
- arch/arm/mm/dma-mapping.c 38 additions, 15 deletionsarch/arm/mm/dma-mapping.c
- arch/arm64/include/asm/kvm_emulate.h 10 additions, 0 deletionsarch/arm64/include/asm/kvm_emulate.h
Loading
Please register or sign in to comment