Merge tetrachloride.(none):/mnt/raid/src/kernel/2.5/bk-linus

into tetrachloride.(none):/mnt/raid/src/kernel/2.5/cpufreq

Documentation/cpu-freq/user-guide.txt

@@ -21,6 +21,8 @@ Contents:
 1.1 ARM
 1.2 x86
 1.3 sparc64
+1.4 ppc
+1.5 SuperH
 
 2. "Policy" / "Governor"?
 2.1 Policy
@@ -77,6 +79,20 @@ cpufreq:
 UltraSPARC-III
 
 
+1.4 ppc
+-------
+
+Several "PowerBook" and "iBook2" notebooks are supported.
+
+
+1.5 SuperH
+----------
+
+The following SuperH processors are supported by cpufreq:
+
+SH-3
+SH-4
+
 
 2. "Policy" / "Governor" ?
 ==========================

arch/i386/kernel/cpu/cpufreq/powernow-k7.c

@@ -268,8 +268,8 @@ static void change_speed (unsigned int index)
 		change_VID(vid);
 	} else {
 		/* Going up, so change VID first */
-		change_VID(fid);
-		change_FID(vid);
+		change_VID(vid);
+		change_FID(fid);
 	}