Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
	arch/powerpc/Makefile

1 files changed, 15 insertions, 1 deletions

diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index 8a3a4f3ef83..4dd08c32297 100644
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -292,7 +292,7 @@
                         fsl,num-channels = <4>;
                         fsl,channel-fifo-len = <24>;
                         fsl,exec-units-mask = <0x97c>;
-                        fsl,descriptor-types-mask = <0x3ab0abf>;
+                        fsl,descriptor-types-mask = <0x3a30abf>;
                 };
 
                 sata@18000 {
@@ -463,4 +463,18 @@
                                   0 0x00800000>;
                 };
         };
+
+        leds {
+                compatible = "gpio-leds";
+
+                pwr {
+                        gpios = <&mcu_pio 0 0>;
+                        default-state = "on";
+                };
+
+                hdd {
+                        gpios = <&mcu_pio 1 0>;
+                        linux,default-trigger = "ide-disk";
+                };
+        };
 };