Merge commit 'v2.6.39-rc6' into x86/cleanups

Merge reason: move to a (much) newer upstream base.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/mpparse.c
index ef32d4c09c646fdcf941dc90df2ef36019571064,5a532ce646bf5c08988e108c9e859fc77e8a0b57..ef59817357fc9c60db4f0e50e35e3d5288d96b35
--- 1/arch/x86/kernel/mpparse.c
--- 2/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@@ -727,8 -725,12 +723,12 @@@ check_slot(unsigned long mpc_new_phys, 
                return -1;
        }
  
 -      return ret;
 +      return 0;
  }
+ #else /* CONFIG_X86_IO_APIC */
+ static
+ inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}
+ #endif /* CONFIG_X86_IO_APIC */
  
  static int  __init replace_intsrc_all(struct mpc_table *mpc,
                                        unsigned long mpc_new_phys,