diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-03 18:04:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-03 18:04:25 -0400 |
| commit | 1f3bd0f2ac870c9eb29590f193ee3d94e2d35514 (patch) | |
| tree | 40a12bd6ac1fb2c0ef51e51265d773a9044c7281 /drivers/video/arcfb.c | |
| parent | bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2 (diff) | |
| parent | a1b2cc50679c1d2eed44e2885f6178ce907498b7 (diff) | |
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
Diffstat (limited to 'drivers/video/arcfb.c')
0 files changed, 0 insertions, 0 deletions