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

Conflicts:

	Documentation/kernel-parameters.txt
	arch/sh/include/asm/elf.h

diff --cc Documentation/kernel-parameters.txt
index abeff96e9d46979a2958df34ed2641527fa809f0,d4f4875fc7c6d2e463e9c2b6e26d2d278cf1399c..bcecfaa1e7701cea682367553551e4fb54791dca
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -796,8 -796,7 +796,9 @@@ and is between 256 and 4096 characters
                        Defaults to the default architecture's huge page size
                        if not specified.
  
 +      hlt             [BUGS=ARM,SH]
 +
+       i8042.debug     [HW] Toggle i8042 debug mode
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from
                             keyboard and cannot control its state

diff --cc arch/sh/include/asm/elf.h
index 4da3a0b109119f3bc9259595272b3fb296b0e410,ee02db110f0da3b78aa0c5a4c66ba13c28c362a3..f7d0b8e6aa84aa529e7584856ad6e347732a308e
--- 1/arch/sh/include/asm/elf.h
--- 2/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@@ -197,8 -189,14 +197,6 @@@ do {                                                                      
  } while (0)
  #endif
  
- #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
 -#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
 -struct task_struct;
 -extern int dump_task_regs (struct task_struct *, elf_gregset_t *);
 -extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);
 -
 -#define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
 -#define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
--
  #ifdef CONFIG_VSYSCALL
  /* vDSO has arch_setup_additional_pages */
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES

diff --cc arch/sh/kernel/smp.c
index c55d314166c79bd8802464d1023fdd931e6967cf,001778f9adaf83eee6cb3766866809516d346bc0..508dfb023628d980233110f462802dd27f8c93d2
--- 1/arch/sh/kernel/smp.c
--- 2/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@@ -82,14 -82,13 +82,16 @@@ asmlinkage void __cpuinit start_seconda
  
        preempt_disable();
  
+       notify_cpu_starting(smp_processor_id());
+ 
        local_irq_enable();
  
 +      cpu = smp_processor_id();
 +
 +      /* Enable local timers */
 +      local_timer_setup(cpu);
        calibrate_delay();
  
 -      cpu = smp_processor_id();
        smp_store_cpu_info(cpu);
  
        cpu_set(cpu, cpu_online_map);

diff --cc drivers/net/sh_eth.c
Simple merge

diff --cc drivers/rtc/rtc-sh.c
Simple merge