Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/kernel/traps.c
index 73ece2633f47799731fa50c21cdd7903cb14a9a9,04d242ab0161967985bcb7f9e24f9fe54fb9f33f,f37cee75ab58f87d3c6ac6c0224d9694e946359c,04d242ab0161967985bcb7f9e24f9fe54fb9f33f..141907ab6e2260adaa2f20cbcdc6747751184c64
--- 1/arch/x86/kernel/traps.c
--- 2/arch/x86/kernel/traps.c
--- 3/arch/x86/kernel/traps.c
--- 4/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@@@ -684,15 -689,14 -688,15 -689,14 +684,15 @@@@@ void math_error(void __user *ip
         */
        cwd = get_fpu_cwd(task);
        swd = get_fpu_swd(task);
 - -    switch (swd & ~cwd & 0x3f) {
 - -    case 0x000: /* No unmasked exception */
 + +
 + +    err = swd & ~cwd & 0x3f;
 + +
-   #if CONFIG_X86_32
+   #ifdef CONFIG_X86_32
 + +    if (!err)
                return;
    #endif
 - -    default: /* Multiple exceptions */
 - -            break;
 - -    case 0x001: /* Invalid Op */
 + +
 + +    if (err & 0x001) {      /* Invalid op */
                /*
                 * swd & 0x240 == 0x040: Stack Underflow
                 * swd & 0x240 == 0x240: Stack Overflow