Marc Zyngier 5fbb0df6f6 Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD ...

Resolve conflicts with current mainline

2018-03-19 17:43:01 +00:00

..

arm_arch_timer.h

Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2018-02-01 15:04:17 +01:00

arm_pmu.h

KVM: arm/arm64: PMU: Fix overflow interrupt injection

2017-07-25 14:18:01 +01:00

arm_psci.h

arm/arm64: KVM: Turn kvm_psci_version into a static inline

2018-02-06 22:54:03 +00:00

arm_vgic.h

Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD

2018-03-19 17:43:01 +00:00

iodev.h

…