Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6126/1: ARM mpcore_wdt: fix build failure and other fixes ARM: 6125/1: ARM TWD: move TWD registers to common header ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is enabled ARM: 6112/1: Use the Inner Shareable I-cache and BTB ops on ARMv7 SMP ARM: 6111/1: Implement read/write for ownership in the ARMv6 DMA cache ops ARM: 6106/1: Implement copy_to_user_page() for noMMU ARM: 6105/1: Fix the __arm_ioremap_caller() definition in nommu.c
Showing
- arch/arm/include/asm/cacheflush.h 4 additions, 0 deletionsarch/arm/include/asm/cacheflush.h
- arch/arm/include/asm/smp_twd.h 17 additions, 0 deletionsarch/arm/include/asm/smp_twd.h
- arch/arm/include/asm/tlbflush.h 28 additions, 1 deletionarch/arm/include/asm/tlbflush.h
- arch/arm/kernel/smp_twd.c 0 additions, 17 deletionsarch/arm/kernel/smp_twd.c
- arch/arm/lib/clear_user.S 1 addition, 0 deletionsarch/arm/lib/clear_user.S
- arch/arm/lib/copy_to_user.S 1 addition, 0 deletionsarch/arm/lib/copy_to_user.S
- arch/arm/mm/cache-v6.S 13 additions, 4 deletionsarch/arm/mm/cache-v6.S
- arch/arm/mm/cache-v7.S 4 additions, 0 deletionsarch/arm/mm/cache-v7.S
- arch/arm/mm/nommu.c 11 additions, 2 deletionsarch/arm/mm/nommu.c
- arch/arm/mm/tlb-v7.S 8 additions, 0 deletionsarch/arm/mm/tlb-v7.S
- drivers/watchdog/Kconfig 1 addition, 1 deletiondrivers/watchdog/Kconfig
- drivers/watchdog/mpcore_wdt.c 11 additions, 10 deletionsdrivers/watchdog/mpcore_wdt.c
Loading
Please register or sign in to comment