Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 14:02:52 +0000 (06:02 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 14:03:17 +0000 (06:03 -0800)
commit94058fc593c7d309af112d3124ae0fbb6880d8ec
tree9dc60e19ee52f2a133ef42451cf33ddade27e6fb
parent3d70f8c617a436c7146ecb81df2265b4626dfe89
parent631a7b5d958d2ef2c2333b105794c693642f0641
Merge branch 'boards' of git://git./linux/kernel/git/horms/renesas into next/boards

Renesas board changes from Simon Horman:

* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove G4EVM machine support
  ARM: shmobile: Remove G3EVM machine support
  ARM: mach-shmobile: Use DT_MACHINE for mackerel
  ARM: shmobile: marzen: add HSPI support
  ARM: shmobile: armadillo800eva: enable restart
  ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2
  ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345
  ARM: shmobile: kzm9g: enable magnetometer ak8975.

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/Makefile
arch/arm/mach-shmobile/board-armadillo800eva.c