commit 583243c062dae7092890d6fb803958e36da98838
author Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Feb 02 08:10:17 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Feb 02 08:10:17 2007 -0800
tree 57f48a01f4ad8f3c33ea5977408bb1da41b90abd
parent 719d96991ac8d96ea318c6d56500e7ed690a4ac0
parent 51bcf092917bfaa88d762879d0bbfe7619e8c16c

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Fix over-optimization by GCC near ip_fast_csum.

MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 465e0832..0ad8803 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3593,6 +3593,12 @@
 W:	http://uclinux-h8.sourceforge.jp/
 S:	Supported
 
+UFS FILESYSTEM
+P: Evgeniy Dushistov
+M: dushistov@mail.ru
+L: linux-kernel@vger.kernel.org
+S: Maintained
+
 USB DIAMOND RIO500 DRIVER
 P:	Cesar Miquel
 M:	miquel@df.uba.ar

arch/i386/kernel/cpu/cyrix.c

diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index abcff92..c0c3b59 100644
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
@@ -173,7 +173,7 @@
 	ccr4 = getCx86(CX86_CCR4);
 	ccr4 |= 0x38;		/* FPU fast, DTE cache, Mem bypass */
 	
-	setCx86(CX86_CCR4, ccr4);
+	setCx86(CX86_CCR3, ccr3);
 	
 	set_cx86_memwb();
 	set_cx86_reorder();