Conflicts: arch/arm/kvm/arm.c arch/arm64/Makefile arch/arm64/kernel/asm-offsets.c virt/kvm/kvm_main.c |
||
|---|---|---|
| .. | ||
| arm-gic-v3.h | ||
| arm-gic.h | ||
| arm-vic.h | ||
| bcm2835.h | ||
| chained_irq.h | ||
| metag-ext.h | ||
| metag.h | ||
| mxs.h | ||
| spear-shirq.h | ||
| versatile-fpga.h | ||
Conflicts: arch/arm/kvm/arm.c arch/arm64/Makefile arch/arm64/kernel/asm-offsets.c virt/kvm/kvm_main.c |
||
|---|---|---|
| .. | ||
| arm-gic-v3.h | ||
| arm-gic.h | ||
| arm-vic.h | ||
| bcm2835.h | ||
| chained_irq.h | ||
| metag-ext.h | ||
| metag.h | ||
| mxs.h | ||
| spear-shirq.h | ||
| versatile-fpga.h | ||