---

yaml --- r: 259118 b: refs/heads/master c: 61d1baa h: refs/heads/master v: v3
git-mirror · Jun 28, 2011 · d1b7314 · d1b7314
1 parent 58362b8
commit d1b7314
Show file tree

Hide file tree

Showing 55 changed files with 782 additions and 6,077 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14497d31e65cca73c9814a1ff373ae294aae616b
+refs/heads/master: 61d1baaea25dbcc22e03604f4d75e151853f574e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3904,7 +3904,6 @@ W:	http://www.penguinppc.org/
 L:	linuxppc-dev@lists.ozlabs.org
 S:	Maintained
 F:	arch/powerpc/platforms/83xx/
-F:	arch/powerpc/platforms/85xx/
 
 LINUX FOR POWERPC PA SEMI PWRFICIENT
 M:	Olof Johansson <olof@lixom.net>

diff --git a/trunk/arch/powerpc/boot/dts/mpc8568mds.dts b/trunk/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -60,8 +60,6 @@
 		compatible = "fsl,mpc8568-localbus", "fsl,pq3-localbus",
 			     "simple-bus";
 		reg = <0xe0005000 0x1000>;
-		interrupt-parent = <&mpic>;
-		interrupts = <19 2>;
 
 		ranges = <0x0 0x0 0xfe000000 0x02000000
 			  0x1 0x0 0xf8000000 0x00008000

diff --git a/trunk/arch/powerpc/boot/dts/p1010rdb.dts b/trunk/arch/powerpc/boot/dts/p1010rdb.dts