Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits) ARM: 5728/1: Proper prefetch abort handling on ARMv6 and ARMv7 ARM: 5727/1: Pass IFSR register to do_PrefetchAbort() ARM: 5740/1: fix valid_phys_addr_range() range check ARM: 5739/1: ARM: allow empty ATAG_CORE ARM: 5735/1: sa1111: CodingStyle cleanups ARM: 5738/1: Correct TCM documentation ARM: 5734/1: arm: fix compilation of entry-common.S for older CPUs ARM: 5733/1: fix bcmring compile error ARM: 5732/1: remove redundant include file ARM: 5731/2: Fix U300 generic GPIO, remove ifdefs from MMCI v3 ARM: Ensure do_cache_op takes mmap_sem ARM: Fix __cpuexit section mismatch warnings ARM: Don't allow highmem on SMP platforms without h/w TLB ops broadcast ARM: includecheck fix: mach-davinci, board-dm365-evm.c ARM: Remove unused CONFIG SA1100_H3XXX ARM: Fix warning: unused variable 'highmem' ARM: Fix warning: #warning syscall migrate_pages not implemented ARM: Fix SA11x0 clocksource warning ARM: Fix SA1100 Neponset serial section mismatch ARM: Fix SA1100 Assabet/Neponset PCMCIA section mismatch warnings ...
Showing
- Documentation/arm/tcm.txt 6 additions, 4 deletionsDocumentation/arm/tcm.txt
- MAINTAINERS 6 additions, 6 deletionsMAINTAINERS
- arch/arm/common/sa1111.c 12 additions, 13 deletionsarch/arm/common/sa1111.c
- arch/arm/configs/h3600_defconfig 0 additions, 1 deletionarch/arm/configs/h3600_defconfig
- arch/arm/configs/iop33x_defconfig 429 additions, 125 deletionsarch/arm/configs/iop33x_defconfig
- arch/arm/include/asm/glue.h 20 additions, 6 deletionsarch/arm/include/asm/glue.h
- arch/arm/include/asm/hardware/iop3xx.h 1 addition, 0 deletionsarch/arm/include/asm/hardware/iop3xx.h
- arch/arm/include/asm/smp_plat.h 16 additions, 0 deletionsarch/arm/include/asm/smp_plat.h
- arch/arm/include/asm/unistd.h 1 addition, 0 deletionsarch/arm/include/asm/unistd.h
- arch/arm/kernel/entry-armv.S 6 additions, 12 deletionsarch/arm/kernel/entry-armv.S
- arch/arm/kernel/entry-common.S 2 additions, 9 deletionsarch/arm/kernel/entry-common.S
- arch/arm/kernel/head-common.S 3 additions, 1 deletionarch/arm/kernel/head-common.S
- arch/arm/kernel/smp.c 4 additions, 9 deletionsarch/arm/kernel/smp.c
- arch/arm/kernel/smp_twd.c 3 additions, 1 deletionarch/arm/kernel/smp_twd.c
- arch/arm/kernel/traps.c 4 additions, 1 deletionarch/arm/kernel/traps.c
- arch/arm/mach-bcmring/core.c 0 additions, 2 deletionsarch/arm/mach-bcmring/core.c
- arch/arm/mach-davinci/board-dm365-evm.c 0 additions, 1 deletionarch/arm/mach-davinci/board-dm365-evm.c
- arch/arm/mach-integrator/pci_v3.c 1 addition, 1 deletionarch/arm/mach-integrator/pci_v3.c
- arch/arm/mach-iop32x/include/mach/iop32x.h 0 additions, 2 deletionsarch/arm/mach-iop32x/include/mach/iop32x.h
- arch/arm/mach-iop33x/include/mach/iop33x.h 0 additions, 2 deletionsarch/arm/mach-iop33x/include/mach/iop33x.h
Loading
Please register or sign in to comment