diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2016-09-09 16:24:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2016-09-09 16:24:23 +1000 |
| commit | 99212c864e1f6d2800e62bc8c52d6335bfca029f (patch) | |
| tree | 56ebe0f73108e9d7d6fcd36fda3f78db1b2e328d /arch/powerpc/kvm/book3s_hv_builtin.c | |
| parent | 2a27f514a47d39c50aaa5c07831ab35178955d47 (diff) | |
| parent | 3f2577749948803491874c6895fec559f3473eab (diff) | |
Merge branch 'kvm-ppc-infrastructure' into kvm-ppc-next
This merges the topic branch 'kvm-ppc-infrastructure' into kvm-ppc-next
so that I can then apply further patches that need the changes in the
kvm-ppc-infrastructure branch.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_builtin.c')
0 files changed, 0 insertions, 0 deletions