diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-17 23:14:17 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-17 23:14:17 +1000 |
| commit | 8434f0892ee85504a230a0e402c569774a8d0c42 (patch) | |
| tree | a8bc1734a06a1c57bd797220a99514e70ec72f93 /arch/powerpc/include/asm/timex.h | |
| parent | 6acdc9a6bad9f23771d24baca763141a24ead6cb (diff) | |
| parent | 94171b19c3f1f4d9d4c0e3aaa1aa161def1ec7ea (diff) | |
Merge branch 'topic/ppc-kvm' into next
Bring in the commit to rename find_linux_pte_or_hugepte() which touches
arch and KVM code, and might need to be merged with the kvmppc tree to
avoid conflicts.
Diffstat (limited to 'arch/powerpc/include/asm/timex.h')
0 files changed, 0 insertions, 0 deletions