Linus Torvalds d10902812c Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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
2011-03-15 20:01:36 -07:00
..
2011-03-15 08:29:44 +01:00
2009-01-29 14:16:51 +01:00
2011-01-13 08:03:25 -08:00
2011-02-23 22:27:52 +01:00
2009-12-05 09:10:12 -08:00
2011-01-21 14:11:12 +01:00
2011-02-14 12:08:28 +01:00
2010-02-16 21:22:26 -08:00
2011-02-28 18:06:22 +01:00
2010-10-26 16:52:08 -07:00
2010-05-07 17:13:04 -07:00
2011-01-07 10:03:50 -05:00
2009-03-27 14:43:57 -04:00
2009-08-27 00:35:56 +02:00
2011-02-24 14:52:18 +01:00
2010-03-10 13:23:34 +01:00
2010-10-26 16:52:08 -07:00
2009-01-21 17:26:06 +09:00
2011-03-03 12:47:08 +01:00
2011-02-23 22:27:52 +01:00
2010-10-07 14:08:55 +01:00
2010-08-14 22:26:51 +02:00
2011-02-18 08:54:05 +01:00
2009-06-13 15:37:30 +02:00
2011-01-13 17:32:46 -08:00
2010-06-09 11:12:36 +02:00
2010-01-05 15:34:49 +09:00
2010-06-29 12:12:59 +02:00
2010-05-07 17:13:04 -07:00
2011-02-18 08:54:05 +01:00
2011-02-23 11:54:02 +01:00
2010-06-29 12:12:59 +02:00
2011-01-13 17:32:39 -08:00
2011-01-26 10:49:57 +10:00
2010-11-18 12:52:04 +01:00
2011-01-26 08:10:49 +01:00
2010-11-01 15:38:34 -04:00
2010-10-26 16:52:08 -07:00
2011-01-13 17:32:44 -08:00
2011-01-13 17:32:44 -08:00
2011-01-13 17:32:44 -08:00
2011-01-13 17:32:44 -08:00
2009-02-02 23:27:09 +05:30
2011-02-25 16:18:52 +01:00
2010-02-12 09:42:39 -08:00
2010-11-12 00:45:41 +01:00
2009-06-15 12:40:02 +02:00
2009-01-31 00:19:32 +05:30
2011-01-12 11:23:16 +02:00
2009-08-21 21:43:46 +02:00
2009-06-15 12:40:02 +02:00