From: Olof Johansson Date: Tue, 29 Jan 2013 17:02:05 +0000 (-0800) Subject: Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=51063a4ed955f82f408fc33cd9cc758e65a88808;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge branch 'boards' of git://git./linux/kernel/git/horms/renesas into next/boards 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 --- 51063a4ed955f82f408fc33cd9cc758e65a88808