| commit | 9681001853f49527cd4b993c7c009383dc04f909 | [log] [tgz] |
|---|---|---|
| author | Marc Zyngier <marc.zyngier@arm.com> | Thu May 24 18:16:34 2012 +0100 |
| committer | Marc Zyngier <marc.zyngier@arm.com> | Thu May 24 18:16:34 2012 +0100 |
| tree | 5cc9db35478b9d3fe5176c8acc1eb3e95d745631 | |
| parent | f9369910a6225b8d4892c3f20ae740a711cd5ace [diff] | |
| parent | 322728e55aa7834e2fab2786b76df183c4843a12 [diff] |
Merge remote-tracking branch 'kvm/next' into kvm-arm-base-3.5-rc0 Conflicts: Documentation/feature-removal-schedule.txt arch/powerpc/kvm/book3s_segment.S arch/x86/include/asm/kvm_para.h