diff --git a/[refs] b/[refs]
index 06e9a17f5f0a..2ab5a87b0996 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cd0e6e79bc1064f26a137a33217a7dfbd541a50
+refs/heads/master: 155acbe7f7bf7563239ff4d188634930512d0c02
diff --git a/trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index e80c9d0c4ee9..49d3d74d4d38 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -76,4 +76,23 @@
 			};
 		};
 	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		led-red {
+			label = "obsa6:red:stat";
+			gpios = <&gpio1 9 1>;
+		};
+
+		led-green {
+			label = "obsa6:green:stat";
+			gpios = <&gpio1 10 1>;
+		};
+
+		led-yellow {
+			label = "obsa6:yellow:stat";
+			gpios = <&gpio1 11 1>;
+		};
+        };
 };
diff --git a/trunk/arch/arm/mach-kirkwood/board-openblocks_a6.c b/trunk/arch/arm/mach-kirkwood/board-openblocks_a6.c
index e71f984b6d3c..815fc6451d52 100644
--- a/trunk/arch/arm/mach-kirkwood/board-openblocks_a6.c
+++ b/trunk/arch/arm/mach-kirkwood/board-openblocks_a6.c
@@ -55,8 +55,8 @@ static unsigned int openblocks_a6_mpp_config[] __initdata = {
 	MPP38_GPIO, /* INIT */
 	MPP39_GPIO, /* USB OC */
 	MPP41_GPIO, /* LED: Red */
-	MPP42_GPIO, /* LED: Yellow */
-	MPP43_GPIO, /* LED: Green */
+	MPP42_GPIO, /* LED: Green */
+	MPP43_GPIO, /* LED: Yellow */
 	0,
 };