From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 22 Nov 2012 09:50:55 +0000 (+0100)
Subject: Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions
X-Git-Tag: v3.8-rc1~106^2~1^2^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions
---

a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68
diff --cc arch/arm/mach-mvebu/armada-370-xp.c
index cd6eac17fb67c,a2f5bbc0d2e51..bd4e13f1b1d7c
--- a/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,