Merge branch 'misc' into for-linus
Conflicts: arch/arm/include/asm/memory.h
Showing
- MAINTAINERS 9 additions, 1 deletionMAINTAINERS
- arch/arm/Kconfig 3 additions, 0 deletionsarch/arm/Kconfig
- arch/arm/crypto/aes-armv4.S 20 additions, 44 deletionsarch/arm/crypto/aes-armv4.S
- arch/arm/crypto/sha1-armv4-large.S 9 additions, 15 deletionsarch/arm/crypto/sha1-armv4-large.S
- arch/arm/include/asm/mach/pci.h 1 addition, 0 deletionsarch/arm/include/asm/mach/pci.h
- arch/arm/include/asm/memory.h 4 additions, 4 deletionsarch/arm/include/asm/memory.h
- arch/arm/include/asm/outercache.h 1 addition, 0 deletionsarch/arm/include/asm/outercache.h
- arch/arm/include/asm/spinlock.h 1 addition, 15 deletionsarch/arm/include/asm/spinlock.h
- arch/arm/kernel/bios32.c 6 additions, 3 deletionsarch/arm/kernel/bios32.c
- arch/arm/kernel/smp.c 8 additions, 23 deletionsarch/arm/kernel/smp.c
- arch/arm/mach-versatile/core.c 14 additions, 1 deletionarch/arm/mach-versatile/core.c
- arch/arm/mach-versatile/pci.c 6 additions, 5 deletionsarch/arm/mach-versatile/pci.c
- arch/arm/mm/Makefile 1 addition, 1 deletionarch/arm/mm/Makefile
- arch/arm/mm/context.c 3 additions, 0 deletionsarch/arm/mm/context.c
- arch/arm/mm/ioremap.c 93 additions, 42 deletionsarch/arm/mm/ioremap.c
- arch/arm/mm/mm.h 12 additions, 0 deletionsarch/arm/mm/mm.h
- arch/arm/mm/mmu.c 17 additions, 19 deletionsarch/arm/mm/mmu.c
- arch/arm/mm/proc-macros.S 5 additions, 0 deletionsarch/arm/mm/proc-macros.S
- arch/arm/mm/proc-v6.S 1 addition, 1 deletionarch/arm/mm/proc-v6.S
- arch/arm/mm/proc-v7-2level.S 1 addition, 1 deletionarch/arm/mm/proc-v7-2level.S
Loading
Please register or sign in to comment