Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renes...
authorOlof Johansson <olof@lixom.net>
Sun, 13 May 2012 04:19:32 +0000 (21:19 -0700)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 13:57:21 +0000 (15:57 +0200)
commit417f381c4568212275f0244500d7d5e1cdb5f99f
treea56d7b281e2ed665fc395e4724611b115a64881b
parent87c35c56f4beed9e43bd41427643215655a31c3d
parentc8241085e8606a14ef48e6d99556133c48aaddaf
Merge branch 'soc-core' of git://git./linux/kernel/git/rafael/renesas into next/soc

* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
  ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s
  ARM: mach-shmobile: clock-r8a7740: add MMCIF clock
  ARM: mach-shmobile: clock-r8a7740: add SDHI clock
  ARM: mach-shmobile: clock-r8a7740: add USB clock
  ARM: mach-shmobile: clock-r8a7740: add FSI clock
  ARM: mach-shmobile: r8a7740: cleanup I2C workaround method
  ARM: mach-shmobile: r8a7740: add gpio_irq support
  ARM: mach-shmobile: sh7372: Add FSI DMAEngine support
  ARM / mach-shmobile: Use preset_lpj with calibrate_delay()
  + renesas fixes and v3.4-rc6

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/Kconfig