| commit | b348a8e194ef549ebc687372e8b6e6cd2894d789 | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Thu Feb 12 09:52:08 2015 +0100 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Thu Feb 12 09:52:08 2015 +0100 |
| tree | 203000fb36b048a65d8428769dfb098c32fd1618 | |
| parent | 8cc748aa76c921d8834ef00f762f31acd2c93aa8 [diff] | |
| parent | 6557bada461afeaa920a189fae2cff7c8fdce39f [diff] |
Merge remote-tracking branch 'kvm/next' into HEAD Conflicts: arch/arm/kvm/Kconfig arch/arm/kvm/mmu.c arch/arm64/kvm/Kconfig arch/arm64/kvm/sys_regs.c