Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/vmlinux.lds.S

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

diff --cc arch/sh/kernel/signal_32.c
Simple merge

diff --cc arch/sh/kernel/signal_64.c
Simple merge

diff --cc arch/sh/kernel/vmlinux.lds.S
index 1b7d9d5,0ce254b..a1e4ec2
--- 1/arch/sh/kernel/vmlinux.lds.S
--- 2/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@@ -94,21 -152,25 +94,13 @@@ SECTION
        .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { EXIT_DATA }
  
        . = ALIGN(PAGE_SIZE);
 -      .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
 -              __init_end = .;
 -              __bss_start = .;                /* BSS */
 -              *(.bss.page_aligned)
 -              *(.bss)
 -              *(COMMON)
 -              . = ALIGN(4);
 -              _ebss = .;                      /* uClinux MTD sucks */
 -              _end = . ;
 -      }
 +      __init_end = .;
 +      BSS_SECTION(0, PAGE_SIZE, 4)
 +      _ebss = .;                      /* uClinux MTD sucks */
 +      _end = . ;
  
-       /*
-        * When something in the kernel is NOT compiled as a module, the
-        * module cleanup code and data are put into these segments. Both
-        * can then be thrown away, as cleanup code is never called unless
-        * it's a module.
-        */
-       /DISCARD/ : {
-               EXIT_CALL
-       }
- 
        STABS_DEBUG
        DWARF_DEBUG
 -      /*
 -       * When something in the kernel is NOT compiled as a module, the
 -       * module cleanup code and data are put into these segments. Both
 -       * can then be thrown away, as cleanup code is never called unless
 -       * it's a module.
 -       */
+ 
+       DISCARDS
  }

diff --cc drivers/input/keyboard/sh_keysc.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge