From b0bd9101491a2a3866dc689450183afa9bff27a2 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Wed, 18 Jul 2012 19:22:54 +0200
Subject: [PATCH] --- yaml --- r: 321279 b: refs/heads/master c:
 f39c1101dd4489bca966974624fe19af1c8ebe23 h: refs/heads/master i:   321277:
 4a5a9068b2cede5623b021eb03d4ae8a52e3d9b7   321275:
 f8566ced4d4eeb380a14e53a942849f1eaa69f4f   321271:
 c7c465d6238c047d23c087c4f8606630c4903f66   321263:
 de02957094f91d71906ad6281109b7e5268ed932   321247:
 49c267ac5b72fb554885cf936b1479686c84bd6d   321215:
 57bd669a415fb62c9d8983320eaaa100522b0c34   321151:
 aa8baef48684dbb24a0ae200efa8492aedbdc318   321023:
 23639312041f42b8c0506280605e457c896dac14 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi    | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-lschlv2.dts   | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-lsxhl.dts     | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-ts219.dtsi    | 2 +-
 trunk/arch/arm/mach-kirkwood/board-dt.c        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e28b9641566e..7d208df85a05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3af1c73f0dde5848d1da50372979c784f2aa34a
+refs/heads/master: f39c1101dd4489bca966974624fe19af1c8ebe23
diff --git a/trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index 2bad626524db..7408655f91b5 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -2,7 +2,7 @@
 
 / {
 	model = "D-Link DNS NASes (kirkwood-based)";
-	compatible = "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+	compatible = "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	gpio_keys {
 		compatible = "gpio-keys";
diff --git a/trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts b/trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts
index f6974d1d27b0..7c8238fbb6f9 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -4,7 +4,7 @@
 
 / {
 	model = "Seagate GoFlex Net";
-	compatible = "seagate,goflexnet", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+	compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	memory {
 		device_type = "memory";
diff --git a/trunk/arch/arm/boot/dts/kirkwood-lschlv2.dts b/trunk/arch/arm/boot/dts/kirkwood-lschlv2.dts
index 37649b58fd91..9510c9ea666c 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-lschlv2.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-lschlv2.dts
@@ -4,7 +4,7 @@
 
 / {
 	model = "Buffalo Linkstation LS-CHLv2";
-	compatible = "buffalo,lschlv2", "buffalo,lsxl", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+	compatible = "buffalo,lschlv2", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	memory {
 		device_type = "memory";
diff --git a/trunk/arch/arm/boot/dts/kirkwood-lsxhl.dts b/trunk/arch/arm/boot/dts/kirkwood-lsxhl.dts
index eb3c07149be1..739019c4cba9 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-lsxhl.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-lsxhl.dts
@@ -4,7 +4,7 @@
 
 / {
 	model = "Buffalo Linkstation LS-XHL";
-	compatible = "buffalo,lsxhl", "buffalo,lsxl", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+	compatible = "buffalo,lsxhl", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	memory {
 		device_type = "memory";
diff --git a/trunk/arch/arm/boot/dts/kirkwood-ts219.dtsi b/trunk/arch/arm/boot/dts/kirkwood-ts219.dtsi
index b4a789aa851f..64ea27cb3298 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/trunk/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -2,7 +2,7 @@
 
 / {
 	model = "QNAP TS219 family";
-	compatible = "qnap,ts219", "mrvl,kirkwood";
+	compatible = "qnap,ts219", "marvell,kirkwood";
 
 	memory {
 		device_type = "memory";
diff --git a/trunk/arch/arm/mach-kirkwood/board-dt.c b/trunk/arch/arm/mach-kirkwood/board-dt.c
index 43142cfbb7cd..e4eb450de301 100644
--- a/trunk/arch/arm/mach-kirkwood/board-dt.c
+++ b/trunk/arch/arm/mach-kirkwood/board-dt.c
@@ -32,7 +32,7 @@ struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
 		       NULL),
 	OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),
 	OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),
-	OF_DEV_AUXDATA("mrvl,orion-nand", 0xf4000000, "orion_nand", NULL),
+	OF_DEV_AUXDATA("marvell,orion-nand", 0xf4000000, "orion_nand", NULL),
 	{},
 };