Merge branch 'linux-2.6' into next

2008-11-12 08:43:22 +11:00
parent 1c1b777a56 f21f237cf5
commit 486936cd93
369 changed files with 10965 additions and 4955 deletions
--- a/arch/powerpc/boot/dts/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/gef_sbc610.dts
@@ -108,7 +108,7 @@
 		compatible = "simple-bus";
 		ranges = <0x0 0xfef00000 0x00100000>;
 		reg = <0xfef00000 0x100000>;	// CCSRBAR 1M
-		bus-frequency = <0>;
+		bus-frequency = <33333333>;

 		i2c1: i2c@3000 {
 			#address-cells = <1>;