-
- Downloads
All merge conflicts were simple overlapping changes.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt 3 additions, 0 deletions...ree/bindings/interrupt-controller/snps,archs-idu-intc.txt
- MAINTAINERS 0 additions, 1 deletionMAINTAINERS
- Makefile 2 additions, 2 deletionsMakefile
- arch/arc/include/asm/delay.h 3 additions, 1 deletionarch/arc/include/asm/delay.h
- arch/arc/kernel/head.S 7 additions, 7 deletionsarch/arc/kernel/head.S
- arch/arc/kernel/mcip.c 23 additions, 32 deletionsarch/arc/kernel/mcip.c
- arch/arc/kernel/smp.c 20 additions, 5 deletionsarch/arc/kernel/smp.c
- arch/arc/kernel/unaligned.c 2 additions, 1 deletionarch/arc/kernel/unaligned.c
- arch/arm64/crypto/aes-modes.S 42 additions, 46 deletionsarch/arm64/crypto/aes-modes.S
- arch/arm64/kernel/topology.c 7 additions, 1 deletionarch/arm64/kernel/topology.c
- arch/parisc/include/asm/bitops.h 7 additions, 1 deletionarch/parisc/include/asm/bitops.h
- arch/parisc/include/uapi/asm/bitsperlong.h 0 additions, 2 deletionsarch/parisc/include/uapi/asm/bitsperlong.h
- arch/parisc/include/uapi/asm/swab.h 3 additions, 2 deletionsarch/parisc/include/uapi/asm/swab.h
- arch/sparc/include/asm/mmu_context_64.h 4 additions, 4 deletionsarch/sparc/include/asm/mmu_context_64.h
- arch/sparc/kernel/irq_64.c 1 addition, 1 deletionarch/sparc/kernel/irq_64.c
- arch/sparc/kernel/sstate.c 3 additions, 3 deletionsarch/sparc/kernel/sstate.c
- arch/sparc/kernel/traps_64.c 73 additions, 0 deletionsarch/sparc/kernel/traps_64.c
- crypto/algapi.c 1 addition, 0 deletionscrypto/algapi.c
- drivers/ata/libata-core.c 4 additions, 2 deletionsdrivers/ata/libata-core.c
- drivers/ata/sata_mv.c 3 additions, 0 deletionsdrivers/ata/sata_mv.c
Loading
Please register or sign in to comment