| commit | a4a741a04814170358f470d7103f8b13ceb6fefc | [log] [tgz] |
|---|---|---|
| author | Paul Mackerras <paulus@ozlabs.org> | Wed Feb 08 19:35:34 2017 +1100 |
| committer | Paul Mackerras <paulus@ozlabs.org> | Wed Feb 08 19:35:34 2017 +1100 |
| tree | d1ce5e0563befbdc5c777dc008e8d1ae029320b6 | |
| parent | 050f23390f6bdbfa7dd2800884d32490489851b7 [diff] | |
| parent | ab9bad0ead9ab179ace09988a3f1cfca122eb7c2 [diff] |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next This merges in a fix which touches both PPC and KVM code, which was therefore put into a topic branch in the powerpc tree. Signed-off-by: Paul Mackerras <paulus@ozlabs.org>