q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/x86/kernel/apic
History
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
..
apic.c Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-03-15 20:01:36 -07:00
apic_flat_64.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
apic_noop.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
bigsmp_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
es7000_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
hw_nmi.c x86: Don't call dump_stack() from arch_trigger_all_cpu_backtrace_handler() 2011-02-18 08:52:29 +01:00
io_apic.c x86: ioapic: Avoid redundant lookup of irq_cfg 2011-03-12 14:12:01 +01:00
ipi.c x86: Always use x86_cpu_to_logical_apicid for cpu -> logical apic id 2011-01-28 14:54:05 +01:00
Makefile x86, nmi_watchdog: Remove the old nmi_watchdog 2010-11-18 09:08:23 +01:00
numaq_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
probe_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
probe_64.c x86: Enable the intr-remap fault handling after local APIC setup 2010-12-13 16:53:32 -08:00
summit_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
x2apic_cluster.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
x2apic_phys.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
x2apic_uv_x.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00