Merge branch 'renesas/dt' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Sun, 22 Apr 2012 20:12:57 +0000 (22:12 +0200)
committerOlof Johansson <olof@lixom.net>
Wed, 9 May 2012 09:14:11 +0000 (02:14 -0700)
commit02abb80f9003b20257fef399a6bb0e0425e69bc2
tree57aceb367088e2e36c2283b57f5b956d6247b502
parent244cf2533ca91d7f6a4ed0a7e81df4bf93246c91
parent3b7b70552afe351a8bd8fff1eb2d60aab2206576
Merge branch 'renesas/dt' into next/dt

First part of DT changes for the Renesas shmobile platform,
pulled from:

  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git dt

* renesas/dt:
  ARM: mach-shmobile: sh7372 generic board support via DT V2
  ARM: mach-shmobile: Rework sh7372 INTCS demuxer V2
  ARM: mach-shmobile: Use INTC_IRQ_PINS_16H on sh7372
  ARM: mach-shmobile: Use 0x3400 as INTCS vector offset
  ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H
  ARM: mach-shmobile: Introduce shmobile_setup_delay()

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>