projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bfd143 8c4340f)
Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 22 Nov 2012 09:50:55 +0000 (10:50 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 22 Nov 2012 09:50:55 +0000 (10:50 +0100)
1  2 
arch/arm/boot/dts/armada-370-xp.dtsi patch | diff1 | diff2 | blob | history
arch/arm/mach-mvebu/armada-370-xp.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
Simple merge
diff --cc arch/arm/mach-mvebu/armada-370-xp.c
index cd6eac17fb67c10cdadda0090b533b7eadd6ab1f,a2f5bbc0d2e51ce1f4833efb038f514767afbe33..bd4e13f1b1d7cd4ed73b74304dea9626e4c64b35
--- 1/arch/arm/mach-mvebu/armada-370-xp.c
--- 2/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@@ -70,10 -51,9 +69,10 @@@ static const char * const armada_370_xp
        NULL,
  };
  
- DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")
+ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
        .init_machine   = armada_370_xp_dt_init,
        .map_io         = armada_370_xp_map_io,
 +      .init_early     = armada_370_xp_init_early,
        .init_irq       = armada_370_xp_init_irq,
        .handle_irq     = armada_370_xp_handle_irq,
        .timer          = &armada_370_xp_timer,