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

..

timer-sr.c

KVM: arm64: Remove noop calls to timer save/restore from VHE switch

2018-03-19 10:53:14 +00:00

vgic-v3-sr.c

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

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