Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
  x86: Clean up apic.c and apic.h
  x86: Remove superflous goal definition of tsc_sync
  x86: dt: Correct local apic documentation in device tree bindings
  x86: dt: Cleanup local apic setup
  x86: dt: Fix OLPC=y/INTEL_CE=n build
  rtc: cmos: Add OF bindings
  x86: ce4100: Use OF to setup devices
  x86: ioapic: Add OF bindings for IO_APIC
  x86: dtb: Add generic bus probe
  x86: dtb: Add support for PCI devices backed by dtb nodes
  x86: dtb: Add device tree support for HPET
  x86: dtb: Add early parsing of IO_APIC
  x86: dtb: Add irq domain abstraction
  x86: dtb: Add a device tree for CE4100
  x86: Add device tree support
  x86: e820: Remove conditional early mapping in parse_e820_ext
  x86: OLPC: Make OLPC=n build again
  x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection
  x86: OLPC: Cleanup config maze completely
  x86: OLPC: Hide OLPC_OPENFIRMWARE config switch
  ...

Fix up conflicts in arch/x86/platform/ce4100/ce4100.c

diff --cc arch/x86/Kconfig
Simple merge

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

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

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

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

diff --cc arch/x86/kernel/head_32.S
Simple merge

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

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

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

diff --cc arch/x86/pci/ce4100.c
Simple merge

diff --cc arch/x86/platform/ce4100/ce4100.c
index cd6f184c3b3f181e5431a50e1639e746c917bb76,68c0dbcc95beda7976fca133324a91ebbc88a023..28071bb31db7bc1512242589dd10ad5184c976dc
--- 1/arch/x86/platform/ce4100/ce4100.c
--- 2/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
@@@ -15,9 -15,11 +15,12 @@@
  #include <linux/serial_reg.h>
  #include <linux/serial_8250.h>
  
 +#include <asm/ce4100.h>
+ #include <asm/prom.h>
  #include <asm/setup.h>
+ #include <asm/i8259.h>
  #include <asm/io.h>
+ #include <asm/io_apic.h>
  
  static int ce4100_i8042_detect(void)
  {
@@@ -129,6 -135,10 +136,11 @@@ void __init x86_ce4100_early_setup(void
        x86_platform.i8042_detect = ce4100_i8042_detect;
        x86_init.resources.probe_roms = x86_init_noop;
        x86_init.mpparse.get_smp_config = x86_init_uint_noop;
-       x86_init.mpparse.find_smp_config = sdv_find_smp_config;
+       x86_init.mpparse.find_smp_config = x86_init_noop;
 +      x86_init.pci.init = ce4100_pci_init;
+ 
+ #ifdef CONFIG_X86_IO_APIC
+       x86_init.pci.init_irq = sdv_pci_init;
+       x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc_nocheck;
+ #endif
  }

diff --cc drivers/i2c/busses/i2c-ocores.c
Simple merge

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

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