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

diff --cc arch/m32r/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/smp.c
index d1165566f06487a6860e8d14e3586f7230d6b66d,8ac3f721d2359e20b09476fbe85aafc7c161f97d..65484b2200b36add20b48dc38caf3f80971c4d29
--- 1/arch/powerpc/kernel/smp.c
--- 2/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@@ -57,9 -57,10 +57,8 @@@
  #define DBG(fmt...)
  #endif
  
- int smp_hw_index[NR_CPUS];
  struct thread_info *secondary_ti;
  
 -cpumask_t cpu_possible_map = CPU_MASK_NONE;
 -cpumask_t cpu_online_map = CPU_MASK_NONE;
  DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE;
  DEFINE_PER_CPU(cpumask_t, cpu_core_map) = CPU_MASK_NONE;
  

diff --cc arch/powerpc/kernel/time.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/xics.c
Simple merge

diff --cc arch/powerpc/sysdev/mpic.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/kernel/smp.c
Simple merge

diff --cc arch/s390/kernel/time.c
Simple merge

diff --cc arch/s390/kernel/topology.c
Simple merge

diff --cc arch/x86/include/asm/pci.h
Simple merge

diff --cc arch/x86/kernel/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel_cacheinfo.c
Simple merge

diff --cc arch/x86/kernel/hpet.c
Simple merge

diff --cc arch/x86/kernel/io_apic.c
Simple merge

diff --cc arch/x86/kernel/irq_64.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/lguest/boot.c
Simple merge

diff --cc include/linux/smp.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/profile.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sched_stats.h
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc lib/Kconfig
Simple merge