commit 9404ef02974a5411687b6c1b8ef3984305620e02
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 10:14:22 2008 -0700

    Fix up 'need_resched()' definition
    
    We should not go through the task pointer to get at the thread info,
    since it's usually cheaper to just access the thread info directly.
    
    So don't make the code look up 'current', when we can just use the
    thread info accessor functions directly.  This generally avoids one
    level of indirection and tends to work better together with code that
    also looks at other thread flags (eg preempt_count).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2b753a1599a28612851a2908abdbf86802c989c5
Merge: 8d97b84... 2ccdcfe...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 09:07:56 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
      types: s390: fix #ifdef reversal in <asm-s390/types.h>

commit 8d97b84935b28ed8944d1be31859a3df7ebe93ae
Merge: 9f1a073... cb0e8b0...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 09:03:42 2008 -0700

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (28 commits)
      [MIPS] Pb1000: bury the remnants of the PCI code
      [MIPS] Fix build failure in mips oprofile code
      [MIPS] fix warning message on SMP kernels
      [MIPS] markeins: build fix
      [MIPS] ELF handling - use SELFMAG instead of numeric constant
      [MIPS] Get rid of __ilog2
      [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus
      [MIPS] XXS1500 code style cleanup
      [MIPS] MTX-1 code style cleanup
      [MIPS] Pb1200/DBAu1200 code style cleanup
      [MIPS] Pb1550 code style cleanup
      [MIPS] Pb1500 code style cleanup
      [MIPS] Pb1100 code style cleanup
      [MIPS] Pb1000 code style cleanup
      [MIPS] DBAu1xx0 code style cleanup
      [MIPS] Alchemy PCI code style cleanup
      [MIPS] Alchemy common code style cleanup
      [MIPS] Alchemy common headers style cleanup
      [MIPS] Add empty argument parenthesis to GCC_IMM_ASM
      [MIPS] msp_hwbutton.c: minor irq handler cleanups
      ...

commit 2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029
Author: H. Peter Anvin <hpa@zytor.com>
Date:   Fri May 9 09:46:38 2008 -0700

    types: s390: fix #ifdef reversal in <asm-s390/types.h>
    
    The #ifdef for the integer types was reversed; the standard pattern in
    these files are:
    
    #ifndef __s390x__
    /* 32-bit code */
    #else
    /* 64-bit code */
    #endif
    
    Stick with the original pattern, but make sure the 32-bit code
    actually comes first!
    
    Reported by Al Viro.
    
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>

commit cb0e8b0fba53e1aa6c4786bc465cfc641e8a77e7
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Tue Apr 29 23:33:47 2008 +0400

    [MIPS] Pb1000: bury the remnants of the PCI code
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 005ca9a3f1238ffebd9c4d09d581f708277d2985
Author: Thiemo Seufer <ths@networkno.de>
Date:   Tue May 6 11:23:33 2008 +0100

    [MIPS] Fix build failure in mips oprofile code
    
    This patch fixes a warning-as-error induced build failure of 64bit MIPS
    kernels.
    
    Signed-off-by: Thiemo Seufer <ths@networkno.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 83738e307365aa2de4a1be65ed574aaebce52ea0
Author: Thiemo Seufer <ths@networkno.de>
Date:   Tue May 6 11:21:22 2008 +0100

    [MIPS] fix warning message on SMP kernels
    
    This patch fixes a (harmless) warning message.
    
    Signed-off-by: Thiemo Seufer <ths@networkno.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b01273f120a390363ceb27bd0ccc60ddf1fb936d
Author: Adrian Bunk <bunk@kernel.org>
Date:   Sun May 4 19:58:54 2008 +0300

    [MIPS] markeins: build fix
    
    This patch fixes the following build errror caused by
    commit 7dffa3c673fbcf835cd7be80bb4aec8ad3f51168
    (ntp: handle leap second via timer):
    
    <--  snip  -->
    
    ...
      CC      arch/mips/emma2rh/markeins/setup.o
    /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/emma2rh/markeins/setup.c:79: error: conflicting types for 'clock'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/clocksource.h:96: error: previous declaration of 'clock' was here
    make[2]: *** [arch/mips/emma2rh/markeins/setup.o] Error 1
    
    <--  snip  -->
    
    [Ralf: reformated to 80 colums after the fix and marked emma2rh_clock as
    __initdata]
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit d303f4a1a09b18e9689aa896bbc23879130b1da8
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Sun May 4 17:50:02 2008 +0100

    [MIPS] ELF handling - use SELFMAG instead of numeric constant
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ddc0d009947bf8645fa3543f4532063a787202da
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Sun May 4 14:53:53 2008 +0100

    [MIPS] Get rid of __ilog2
    
    56a6b1eb7bfb5ace0b5cb9c149f502fbd101b8ab was a bit too conservative and
    left __ilog2 around which is only used as an internal function for other
    bitops.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit fcd84f2fca49166dab2dba259eca6e633585763f
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sun May 4 00:25:02 2008 +0200

    [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus
    
    Only MIPS32 and MIPS64 CPUs implement clz/dclz. Therefore don't export
    __ilog2() for non MIPS32/MIPS64 cpus and use generic __fls bitop code for
    these cpus.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 7ff83f21d23d17b63bbb984fee5d12aa5a8066b3
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:31:03 2008 +0400

    [MIPS] XXS1500 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - remove needless parentheses;
    
    - remove unneeded numeric literal type cast;
    
    - insert spaces between operator and its operands;
    
    - remove excess new lines;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the structure initializer;
    
    - fix typos, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1ff1a78cbb6fb6ceafac1b2cbdd72c939a7c9bae
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:30:12 2008 +0400

    [MIPS] MTX-1 code style cleanup
    
    Fix many errors and warnings given by checkpatch.pl:
    
    - space after opening and before closing parentheses;
    
    - use of C99 // comments;
    
    - leading spaces instead of tabs;
    
    - brace not on the same line with 'else' in the 'if' statement;
      statement;
    
    - printk() without KERN_* facility level;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    - including <asm/gpio.h> instead of <linux/gpio.h>.
    
    In addition to these changes, also do the following:
    
    - insert spaces between operator and its operands;
    
    - replace tab between the function type and name with space in
      mtx1_pci_idsel() declaration;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array/structure
      initializers;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c3d1d5c8c10c937c65186f6dac75e2fb4675ef07
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:29:04 2008 +0400

    [MIPS] Pb1200/DBAu1200 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - initialization of a 'static' variable to 0;
    
    - space after opening and before closing parentheses;
    
    - missing space between 'for' and opening parenthesis;
    
    - macros with complex values not enclosed in parentheses;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - mention DBAu1200 board in the Makefile;
    
    - replace the group of #include/#ifdef directives by a single
      #include <au1xxx.h> since this header contains the needed stuff;
    
    - properly indent the blocks;
    
    - insert spaces between operator and its operands, remove excess spaces
      there;
    
    - remove needless parentheses and add some for clarity;
    
    - replace numeric literals/expressions with the matching macros;
    
    - remove space after the type cast's closing parenthesis;
    
    - reduce pb1200_setup_cascade() to the single 'return' statement;
    
    - reduce the number of printed empty lines in the so-called CPLD
      workaround;
    
    - remove #undef AU1X00_EXTERNAL_INT since that macro is not defined
      anywhere;
    
    - replace spaces after the macro name with tabs in the #define directives;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typo in the BCSR_RESETS_PWMR1mUX macro's name;
    
    - group all Pb1200 PCMCIA definitions together;
    
    - put the function's result type and name/parameters on the same line;
    
    - insert missing and remove excess new lines;
    
    - make the multi-line comment style consistent with the kernel style
      elsewhere by adding empty first line and/or adding space/asterisk on
      their left side;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - combine some comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 6afabe6c9335c0534224b53c3db4b091621af2dd
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:28:17 2008 +0400

    [MIPS] Pb1550 code style cleanup
    
    Fix a few errors and warnings given by checkpatch.pl:
    
    - macros with complex values not enclosed in parentheses;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - replace numeric literals with the matching macros;
    
    - properly indent the code and the array initializers;
    
    - insert spaces between operator and its operands, also remove excess spaces
      there;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives, also
      sometimes insert space there for better looks;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 2091a17ff7f32432976d1eacbb79a06819d95301
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:27:20 2008 +0400

    [MIPS] Pb1500 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - replace numeric literals/expressions with the matching macros;
    
    - insert spaces between operator and its operands;
    
    - properly indent the code and the array initializers;
    
    - remove useless #if dirctive from board_setup();
    
    - remove needless parentheses;
    
    - remove unneeded type casts;
    
    - remove excess new lines;
    
    - make hexadecimal literals all lower case;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives,
      also sometimes insert space there for better looks;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit be1c3c1ed13f31ae8f9d5d043d96d2e56b5ee1d5
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:26:28 2008 +0400

    [MIPS] Pb1100 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - space between asterisk and variable name;
    
    - use of C99 // comments;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - properly indent the code;
    
    - remove space after the type cast's closing parenthesis;
    
    - replace numeric literals/expressions with the matching macros;
    
    - replace spaces after the macro name with tabs in the #define directives,
      and sometimes insert spaces there;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style
      elsewhere by adding empty first line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 7916c3548e53bffb0545a1d0dc7fde86d79add92
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:25:55 2008 +0400

    [MIPS] Pb1000 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - brace not on the same line with condition in the 'switch' statement;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - properly indent the 'switch' statement;
    
    - remove needless parentheses;
    
    - insert spaces between operator and its operands;
    
    - replace numeric literals/expressions with the matching macros;
    
    - remove useless #if dirctive from board_setup();
    
    - remove unneeded numeric literal type casts;
    
    - remove space after the type cast's closing parenthesis;
    
    - replace spaces after the macro name with tabs in the #define directives, and
      sometimes insert spaces there;
    
    - remove excess new lines;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first/last line;
    
    - combine some comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit abd14cc00d940b8b5b4fc92be23f656b57c6ecfe
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:25:04 2008 +0400

    [MIPS] DBAu1xx0 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - macros with complex values not enclosed in parentheses;
    
    - leading spaces instead of tabs;
    
    - printk() without KERN_* facility level;
    
    - using simple_strtol() where strict_strtol() could be used;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - initialize variable instead of assigning value later where it makes sense;
    
    - insert spaces between operator and its operands, also remove excess spaces
      there;
    
    - remove unneeded numeric literal type casts;
    
    - remove needless parentheses;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first/last line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit a9633279cf13de15b7002b71a507baf89d0619ca
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:23:27 2008 +0400

    [MIPS] Alchemy PCI code style cleanup
    
    Fix 15 errors and 4 warnings given by checkpatch.pl:
    
    - space between the asterisk and variable name;
    
    - space after opening and before closing parentheses;
    
    - leading spaces instead of tabs;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - combine the nested 'if' statements into one when possible;
    
    - remove needless parentheses;
    
    - add missing and remove excess spaces between operator and its operands;
    
    - fix printk() format specifiers mismatching the argument types;
    
    - put the function's result type and name/parameters on the same line;
    
    - insert missing and remove excess new lines;
    
    - properly indent multi-line expressions;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line;
    
    - fix typos, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c1dcb14ec2ae3c594ce1c2db953004083f2bd4a0
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:18:41 2008 +0400

    [MIPS] Alchemy common code style cleanup
    
    Fix many errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - missing space between the type and asterisk in a variable declaration;
    
    - space between the asterisk and function/variable name;
    
    - leading spaces instead of tabs;
    
    - space after opening and before closing parentheses;
    
    - initialization of a 'static' variable to 0;
    
    - missing spaces around assignement/comparison operator;
    
    - brace not on the same line with condition (or 'else') in the 'if'/'switch'
      statement;
    
    - missing space between 'if'/'for'/'while' and opening parenthesis;
    
    - use of assignement in 'if' statement's condition;
    
    - printk() without KERN_* facility level;
    
    - EXPORT_SYMBOL() not following its function immediately;
    
    - unnecessary braces for single-statement block;
    
    - adding new 'typedef' (where including <linux/types.h> will do);
    
    - use of 'extern' in the .c file (where it can be avoided by including header);
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - insert missing space after opening brace and/or before closing brace in the
      structure initializers;
    
    - insert spaces between operator and its operands;
    
    - put the function's result type and name/parameters on the same line;
    
    - properly indent multi-line expressions;
    
    - remove commented out code;
    
    - remove useless initializers and code;
    
    - remove needless parentheses;
    
    - fix broken/excess indentation;
    
    - add missing spaces between operator and its operands;
    
    - insert missing and remove excess new lines;
    
    - group 'else' and 'if' together where possible;
    
    - make au1xxx_platform_init() 'static';
    
    - regroup variable declarations in pm_do_freq() for prettier look;
    
    - replace numeric literals with the matching macros;
    
    - fix printk() format specifiers mismatching the argument types;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line and/or adding space on their left side;
    
    - make two-line comments that only have one line of text one-line;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - fix/remove obsolete references in the comments;
    
    - reformat some comments;
    
    - add comment about the CPU:counter clock ratio to calc_clock();
    
    - update MontaVista copyright;
    
    - remove Pete Popov's and Steve Longerbeam's old email addresses...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ff6814d53016081947ff4021e00db3f806a561c9
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:18:35 2008 +0400

    [MIPS] Alchemy common headers style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - space after opening and before closing parentheses;
    
    - opening brace following 'struct' not on the same line;
    
    - leading spaces instead of tabs;
    
    - use of C99 // comments;
    
    - macros with complex values not enclosed in parentheses;
    
    - missing space between the type and asterisk in a variable declaration;
    
    - space between asterisk and function name;
    
    - including <asm/io.h> instead of <linux/io.h> and <asm/irq.h> instead of
      <linux/irq.h>;
    
    - use of '__inline__' instead of 'inline';
    
    - space between function name and opening parenthesis;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - remove needless parentheses;
    
    - insert spaces between operator and its operands;
    
    - replace spaces after the macro name with tabs in the #define directives and
      after the type in the structure field declarations;
    
    - remove excess tabs after the macro name in the #define directives and in the
      'extern' variable declarations;
    
    - remove excess spaces between # and define for the SSI_*_MASK macros to align
      with other such macros;
    
    - put '||' operator on the same line with its first operand;
    
    - properly indent multi-line function prototypes;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line and/or adding space/asterisk on their left side;
    
    - make two-line comments that only have one line of text one-line;
    
    - convert the large multi-line comment in au1xxx_ide.h into several one-liners,
      replace spaces with tabs there;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - insert missing and remove excess new lines;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's and Steve Longerbeam's old email addresses...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ad1d77a38575644b112340fd9115ac21dd533166
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Thu May 1 15:28:53 2008 +0100

    [MIPS] Add empty argument parenthesis to GCC_IMM_ASM
    
    This is to clarify that GCC_IMM_ASM does not take an argument as the
    context of the macro's invocation seems to imply.
    
    As suggested by Maciej W. Rozycki (macro@linux-mips.org).
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1c9e919f48a49fda2ff2c607891cc17024e75122
Author: Jeff Garzik <jeff@garzik.org>
Date:   Fri Apr 18 19:23:01 2008 -0400

    [MIPS] msp_hwbutton.c: minor irq handler cleanups
    
    - remove always-true test
    
    - neaten request_irq() indentation
    
    This change's main purpose is to prepare for the patchset in
    jgarzik/misc-2.6.git#irq-remove, that explores removal of the
    never-used 'irq' argument in each interrupt handler.
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit a64063046026729a69ad06c94453f4ddaa562d60
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon Apr 21 11:51:37 2008 +0300

    [MIPS] unexport __kmap_atomic_to_page
    
    This patch removes the no longer used export of __kmap_atomic_to_page.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit dc3bf3532bf7240cf117b8ecf3d16526810eba6a
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Fri Apr 18 10:56:07 2008 +0100

    [MIPS] Initialize max_pfn again.
    
    This was dropped by
    
    commit a0d9e2d891e4cf54676c430da63bd4a17d1cdb80 (lmo)
    commit b6f1f0dea1469e0c956eb89399916d60dd2a3808 (ko)
    Author: Franck Bui-Huu <vagabon.xyz@gmail.com>
    Date:   Fri Aug 11 17:51:48 2006 +0200
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit f4324f3eeb311d1889b8c25076f2669012323842
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Wed Apr 16 19:55:26 2008 +0100

    [MIPS] IRIX: Handle do_brk() error return correctly.
    
    do_brk's return value was stored in an unsigned long variable before being
    tested for less than zero making the test always fail.  Also do_brk's
    called irix_map_prda_page wasn't forwarding do_brk() success.
    
    Bug checking the return value of do_brk() and initial fix for it found
    by Roel Kluin <12o3l@tiscali.nl>.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1928cc84a0a937ce7042d9235996ab380f36f18a
Author: Kevin D. Kissell <kevink@mips.com>
Date:   Wed Apr 16 15:32:22 2008 +0200

    [MIPS] MT: Functional fixes and a little reformatting of APRP support
    
    Signed-off-by: Kevin D. Kissell <kevink@mips.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9f2546adedda600687bba6ef3e1546a8ecbc16eb
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Thu Apr 17 13:42:50 2008 +0100

    [MIPS] Don't use max_pfn which is no longer initialized these days.
    
    Still won't play nicely with esotheric configurations such as discontig
    memory ...
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit d0e7ba063233105febd960e0716d5e9fd9159307
Author: Roel Kluin <12o3l@tiscali.nl>
Date:   Wed Apr 16 17:09:58 2008 +0200

    [MIPS] ip27-timer: fix unsigned irq < 0
    
    Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
    Acked-By: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b618336aac146df24ace641dff69dc46675886c9
Author: Kevin D. Kissell <kevink@mips.com>
Date:   Wed Apr 16 15:32:22 2008 +0200

    [MIPS] Fixes necessary for non-SMP kernels and non-relocatable binaries
    
    Signed-off-by: Kevin D. Kissell <kevink@mips.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 8e07c2c6af30dccfa573033d280980b2b5eb35fe
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Sat Apr 5 22:16:21 2008 +0400

    [MIPS] Alchemy: SMBus resource fix
    
    The Alchemy platform code registers the SMBus device using the virtual
    address of its registers instead of the physical one -- fix this, taking
    into account that actually the whole megabyte is decoded by any of the
    programmable serial controllers (one of which is SMBus), and that all the
    Alchemy peripherals are directly mappable into KSEG1 kernel space and
    therefore ioremap() call would just boil down to CKSEG1ADDR() invocation.
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9f1a0735395ba2b2efa5012b5bf7f915299f1a79
Author: Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
Date:   Mon May 12 19:35:31 2008 +0900

    Fix c67x00-ll-hpi compilation failure (bug #10627)
    
    This patch fixes bug #10627 which caused the compilation error below.
    
      CC [M]  drivers/usb/c67x00/c67x00-ll-hpi.o
      drivers/usb/c67x00/c67x00-ll-hpi.c: In function `ll_recv_msg':
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: `HZ' undeclared (first use in this function)
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: (Each undeclared identifier is reported only once
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: for each function it appears in.)
    
    Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3c29970c02829a91ab337abea2860973b291bd48
Merge: 59b1c82... 0d4b6b9...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 07:29:08 2008 -0700

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] ppc: More compile fixes
      [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
      [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c
      [POWERPC] ppc: Use ebony_defconfig for defconfig
      [POWERPC] Fix default cputable entries for e200 and e500 families

commit 59b1c82500bb5d658891bc8e8a2308b76d58a4de
Merge: 454aa38... a94a172...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 07:28:37 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Work around memory probing bug in openfirmware.
      sparc32: fix rtrap.S typo
      sparc32: Fix build.

commit 454aa3899f0bebb5aa7f8788690668d106f9a34f
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon May 12 12:31:37 2008 +0100

    cris: Fix compile failure due to typo in serial driver
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 79f999d0aa264f72f5491be14b4bf60137a3d3a9
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon May 12 12:29:25 2008 +0100

    strip: Fix termios assumption
    
    Strip assumes that the tty drivers always have a set_termios method which
    may not be true. Check this when binding to the tty so that we don't oops
    later.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0d4b6b901c3d41beb0e1620316aee0aa234edf7f
Author: Paul Mackerras <paulus@samba.org>
Date:   Mon May 12 22:57:51 2008 +1000

    [POWERPC] ppc: More compile fixes
    
    This fixes a few more miscellaneous compile problems with ARCH=ppc.
    
    1. Don't compile devres.c on ARCH=ppc, it doesn't have ioremap_flags.
    2. Include <asm/irq.h> in setup.c for the __DO_IRQ_CANON definition.
    3. Include <linux/proc_fs.h> in residual.c for the
       definition of create_proc_read_entry.
    4. Fix xchg_ptr to be a static inline to eliminate a compiler warning.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 6a8b23086c82d7cc4f424518532c8b10d95715c0
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:50 2008 +1000

    [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
    
    arch/ppc doesn't have prom_init.o (anymore).
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 9717e87fb19f21d1be2ac1dce8f65045547b7e1b
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:49 2008 +1000

    [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c
    
    It needs it:
    
    	arch/ppc/kernel/ppc_ksyms.c:152: error: '__flush_icache_range'
    	undeclared here (not in a function)
    
    and a few more like that.
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 426e53fcbab76b68524f8f07c2afd7a4340c627a
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:48 2008 +1000

    [POWERPC] ppc: Use ebony_defconfig for defconfig
    
    We used to use common_defconfig, but it was removed some time ago.
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 516c8be3a93ec2b0746ba0907f38c1d1e62f4992
Author: Paul Mackerras <paulus@samba.org>
Date:   Mon May 12 14:20:35 2008 +1000

    [POWERPC] Fix default cputable entries for e200 and e500 families
    
    Commit 76bc080ef5a34aedb63e1691f28c6b42f3468e4e ("POWERPC] Make default
    cputable entries reflect selected CPU family") added default entries
    for the e200 and e500 families, but missed a closing brace on those
    entries, as pointed out by David Gibson.  This adds the closing braces.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit a94a172d6c826232e623160ae134abbce181a41f
Author: David S. Miller <davem@davemloft.net>
Date:   Sun May 11 21:04:48 2008 -0700

    sparc64: Work around memory probing bug in openfirmware.
    
    Read all of the OF memory and translation tables, then read
    the physical available memory list twice.
    
    When making these requests, OF can allocate more memory to
    do it's job, which can remove pages from the available
    memory list.
    
    So fetch in all of the tables at once, and fetch the available
    list last to make sure we read a stable value.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8bf3028ede10dfe22e1729ebad96f6eb77020712
Author: Robert Reif <reif@earthlink.net>
Date:   Sun May 11 18:05:20 2008 -0700

    sparc32: fix rtrap.S typo
    
    Fix compile problem in rtrap.S
    
    arch/sparc/kernel/built-in.o: In function `ret_trap_userwins_ok':
    arch/sparc/kernel/rtrap.S:(.text+0x1900): undefined reference to
    `PSR_SYCALL'
    
    Signed-off-by: Robert Reif <reif@earthlink.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b5e10df665e756c2c68442177e460d90bb9cf979
Author: Robert Reif <reif@earthlink.net>
Date:   Sun May 11 15:47:05 2008 -0700

    sparc32: Fix build.
    
    Fix sparc32 build error due to undefined bool type.
    
    CC [M] fs/ocfs2/dlm/userdlm.o
    In file included from include/asm/sigcontext.h:6,
    from include/asm/signal.h:5,
    from include/linux/signal.h:4,
    from fs/ocfs2/dlm/userdlm.c:30:
    include/asm/ptrace.h:42: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or
    ‘__attribute__’ before ‘pt_regs_is_syscall’
    include/asm/ptrace.h:47: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or
    ‘__attribute__’ before ‘pt_regs_clear_syscall’
    make[3]: *** [fs/ocfs2/dlm/userdlm.o] Error 1
    make[2]: *** [fs/ocfs2/dlm] Error 2
    make[1]: *** [fs/ocfs2] Error 2
    make: *** [fs] Error 2
    
    Signed-off-by: Robert Reif <reif@earthlink.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>