diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2017-08-31 12:37:03 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2017-08-31 12:37:03 +1000 |
| commit | 4dafecde443a3f5690d68a3a0d32202b634b2675 (patch) | |
| tree | 6faa5efe3fa7f9a24514111777515e7a4c8bd8c1 /mm/slab.h | |
| parent | e3bfed1df379c18f20feb06427d952b766e2c00f (diff) | |
| parent | 94a04bc25a2c6296bd0c5e82c10e8231c2b11f77 (diff) | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the 'ppc-kvm' topic branch from the powerpc tree in
order to bring in some fixes which touch both powerpc and KVM code.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'mm/slab.h')
0 files changed, 0 insertions, 0 deletions