tree ac0c5a72b503e1debbc06a10682f4a551bc304ac
parent 1f3bd0f2ac870c9eb29590f193ee3d94e2d35514
parent 816af7422f5bdbb74a0c9bb09735a9aeb9522c30
author Linus Torvalds <torvalds@linux-foundation.org> 1307141603 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1307141603 +0900

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  ARM: mach-shmobile: add DMAC clock definitions on SH7372
  ARM: arch-shmobile: support SDHI card detection on mackerel, using a GPIO
  sh_mobile_meram: MERAM platform data for LCDC