diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-14 11:00:16 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-14 11:02:33 +0200 |
commit | b11c3f59475f4bb57b967642f362ea846302dab1 (patch) | |
tree | 38eb0dfb559e24e358e7f9b33727334a8c79b335 /arch/mips/kernel/asm-offsets.c | |
parent | dca4d728773a2f48e999c8617524bbf8dee4807f (diff) | |
parent | 6df82a7b88dc9b0b519765562b005ef9196d812a (diff) | |
download | op-kernel-dev-b11c3f59475f4bb57b967642f362ea846302dab1.zip op-kernel-dev-b11c3f59475f4bb57b967642f362ea846302dab1.tar.gz |
Merge branch 'kvm-mips-fixes' into HEAD
Merge MIPS patches destined to both 4.7 and kvm/next, to avoid
unnecessary conflicts.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/mips/kernel/asm-offsets.c')
0 files changed, 0 insertions, 0 deletions