Merge commit 'kumar/next' into merge

2009-06-26 16:58:01 +10:00
parent 5ba762c9bb 66c6b856d8
commit fd0cca754f
16 changed files with 1157 additions and 1180 deletions
--- a/arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -253,6 +253,7 @@
 			/* Filled in by U-Boot */
 			clock-frequency = <0>;
 			status = "disabled";
+			sdhci,1-bit-only;
 		};

 		crypto@30000 {