Merge branch 'linus' into cpus4096

Conflicts:

	drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 11 insertions, 0 deletions

diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index 765e43c997da..bd700651f360 100644
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -171,6 +171,17 @@
                                 fsl,cpm-command = <0000>;
                                 linux,network-index = <1>;
                         };
+
+                        i2c@860 {
+                                compatible = "fsl,mpc866-i2c",
+                                             "fsl,cpm1-i2c";
+                                reg = <0x860 0x20 0x3c80 0x30>;
+                                interrupts = <16>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-command = <0x10>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
                 };
         };