Files
linux/arch/microblaze/include/asm
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
..
2009-03-27 14:25:27 +01:00
2009-10-29 22:34:15 +09:00
2010-08-04 10:45:17 +02:00
2010-10-21 15:51:41 +10:00
2010-10-21 15:51:39 +10:00
2009-03-27 14:25:33 +01:00
2009-03-27 14:25:35 +01:00
2009-05-22 09:50:46 +02:00
2010-08-04 10:45:17 +02:00
2010-06-09 11:12:36 +02:00
2009-03-27 14:25:42 +01:00
2010-10-21 15:51:20 +10:00
2011-02-07 19:12:30 +01:00
2009-03-27 14:25:44 +01:00
2010-04-01 08:38:19 +02:00
2011-01-03 10:01:29 +01:00
2010-10-21 15:51:25 +10:00
2009-03-27 14:25:15 +01:00
2009-07-06 10:26:57 +02:00
2009-03-27 14:25:39 +01:00
2009-07-06 10:26:59 +02:00
2011-01-16 14:29:21 +01:00
2010-04-01 08:38:24 +02:00
2010-08-04 10:22:35 +02:00