]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jun 2011 22:04:25 +0000 (07:04 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jun 2011 22:04:25 +0000 (07:04 +0900)
commit46f8905a4bca6eaf716cb28d5476b7e1b6cac4a5
tree40a12bd6ac1fb2c0ef51e51265d773a9044c7281
parent7fc2f5c471ca6b5ed99c3a203ad22b36ac397768
parent7f6f7a53f6dce25d0736366d9a6065dde9591d66
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