From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jun 2011 22:53:23 +0000 (+0900)
Subject: Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd4ecf877a4d629c38571405fd649077c12dec50;p=thirdparty%2Flinux.git

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
---

cd4ecf877a4d629c38571405fd649077c12dec50