| commit | e3a9da76e899851fdcaa1afd58bdc3996e2455d9 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 15 May 2011 09:51:34 +0000 (15 05:51 -0400) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 15 May 2011 09:51:34 +0000 (15 05:51 -0400) | ||
| tree | 028d488ccea5135b77a1ff811811228468b0c8b2 | treesnapshot (tar.gz zip) |
| parent | 9e883258f75634196d562374efb56915faf89b0b | commitdiff |
| parent | 01662f3e513399107c7278f2ee8f6ee4cf03fa70 | commitdiff |
Merge commit '01662f3e513399107c7278f2ee8f6ee4cf03fa70' into upstream-merge
* commit '01662f3e513399107c7278f2ee8f6ee4cf03fa70':
PPC: Implement e500 (FSL) MMU
PPC: Add another 64 bits to instruction feature mask
PPC: Add GS MSR definition
PPC: Make MPC8544DS emulation work w/o KVM
PPC: Make MPC8544DS obey -cpu switch
Fix off-by-one error in sizing pSeries hcall table
ppc64: Fix out-of-tree builds
kvm: ppc: warn user on PAGE_SIZE mismatch
Conflicts:
target-ppc/cpu.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '01662f3e513399107c7278f2ee8f6ee4cf03fa70':
PPC: Implement e500 (FSL) MMU
PPC: Add another 64 bits to instruction feature mask
PPC: Add GS MSR definition
PPC: Make MPC8544DS emulation work w/o KVM
PPC: Make MPC8544DS obey -cpu switch
Fix off-by-one error in sizing pSeries hcall table
ppc64: Fix out-of-tree builds
kvm: ppc: warn user on PAGE_SIZE mismatch
Conflicts:
target-ppc/cpu.h
Signed-off-by: Avi Kivity <avi@redhat.com>