Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...

From Simon Horman, updates to a few shmobile boards.

* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Include sh73a0 DTSI in kzm9g
  ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva
  ARM: shmobile: kzm9g: Use of_machine_is_compatible()
  ARM: shmobile: add sample amixer settings for armadillo800eva
  ARM: shmobile: add sample amixer settings for ap4evb
  ARM: shmobile: fix sample amixer settings for mackerel
  ARM: mackerel: include the correct .dtsi file

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/r8a7740-armadillo800eva.dts
Simple merge

diff --cc arch/arm/boot/dts/sh7372-mackerel.dts
Simple merge

diff --cc arch/arm/boot/dts/sh73a0-kzm9g.dts
Simple merge