Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: dmaengine: shdma: fix a regression: initialise DMA channels for memcpy dmaengine: shdma: Fix up fallout from runtime PM changes. Revert "clocksource: sh_cmt: Runtime PM support" Revert "clocksource: sh_tmu: Runtime PM support" sh: Fix up asm-generic/ptrace.h fallout. sh64: Move from P1SEG to CAC_ADDR for consistent sync. sh64: asm/pgtable.h needs asm/mmu.h sh: asm/tlb.h needs linux/swap.h sh: mark DMA slave ID 0 as invalid sh: Update shmin to reflect PIO dependency. sh: arch/sh/kernel/process_32.c needs linux/prefetch.h. sh: add MMCIF runtime PM support on ecovec sh: switch ap325rxa to dynamically manage the platform camera
Showing
- arch/sh/Kconfig 1 addition, 1 deletionarch/sh/Kconfig
- arch/sh/boards/mach-ap325rxa/setup.c 13 additions, 19 deletionsarch/sh/boards/mach-ap325rxa/setup.c
- arch/sh/boards/mach-ecovec24/setup.c 3 additions, 0 deletionsarch/sh/boards/mach-ecovec24/setup.c
- arch/sh/include/asm/pgtable.h 1 addition, 0 deletionsarch/sh/include/asm/pgtable.h
- arch/sh/include/asm/ptrace.h 4 additions, 2 deletionsarch/sh/include/asm/ptrace.h
- arch/sh/include/asm/tlb.h 1 addition, 0 deletionsarch/sh/include/asm/tlb.h
- arch/sh/include/cpu-sh4/cpu/sh7722.h 1 addition, 0 deletionsarch/sh/include/cpu-sh4/cpu/sh7722.h
- arch/sh/include/cpu-sh4/cpu/sh7724.h 1 addition, 0 deletionsarch/sh/include/cpu-sh4/cpu/sh7724.h
- arch/sh/include/cpu-sh4/cpu/sh7757.h 1 addition, 0 deletionsarch/sh/include/cpu-sh4/cpu/sh7757.h
- arch/sh/kernel/process_32.c 1 addition, 0 deletionsarch/sh/kernel/process_32.c
- arch/sh/mm/consistent.c 1 addition, 1 deletionarch/sh/mm/consistent.c
- drivers/clocksource/sh_cmt.c 2 additions, 10 deletionsdrivers/clocksource/sh_cmt.c
- drivers/clocksource/sh_tmu.c 2 additions, 10 deletionsdrivers/clocksource/sh_tmu.c
- drivers/dma/shdma.c 7 additions, 2 deletionsdrivers/dma/shdma.c
Loading
Please register or sign in to comment