diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 08:43:18 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 08:43:18 +1100 |
| commit | a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a (patch) | |
| tree | 1d2061bbf8ac521bb9839075beb4263752bebb23 /kernel/memremap.c | |
| parent | 78e5dfea84dc15d69940831b3981b3014d17222e (diff) | |
| parent | 681c617b7c42fce0798c2b0b472f270f28c82d56 (diff) | |
Merge branch 'topic/ppc-kvm' into next
This brings in two series from Paul, one of which touches KVM code and
may need to be merged into the kvm-ppc tree to resolve conflicts.
Diffstat (limited to 'kernel/memremap.c')
0 files changed, 0 insertions, 0 deletions