Linus Torvalds 322aafa664 Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits) x86, mrst: Fix whitespace breakage in apb_timer.c x86, mrst: Fix APB timer per cpu clockevent x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC x86, olpc: Use pci subarch init for OLPC x86, pci: Add arch_init to x86_init abstraction x86, mrst: Add Kconfig dependencies for Moorestown x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI x86, pci: Add sanity check for PCI fixed bar probing x86, legacy_irq: Remove duplicate vector assigment x86, legacy_irq: Remove left over nr_legacy_irqs x86, mrst: Platform clock setup code x86, apbt: Moorestown APB system timer driver x86, mrst: Add vrtc platform data setup code x86, mrst: Add platform timer info parsing code x86, mrst: Fill in PCI functions in x86_init layer x86, mrst: Add dummy legacy pic to platform setup x86/PCI: Moorestown PCI support x86, ioapic: Add dummy ioapic functions x86, ioapic: Early enable ioapic for timer irq ... Fixed up semantic conflict of new clocksources due to commit 17622339af ("clocksource: add argument to resume callback").		2010-03-07 15:59:39 -08:00
..
realmode	x86: Document linker script ASSERT() quirk	2009-10-16 07:18:46 +02:00
boot.c	Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-07 15:59:39 -08:00
cstate.c	ACPI: Use the ARB_DISABLE for the CPU which model id is less than 0x0f.	2009-12-14 21:54:30 -05:00
Makefile	ACPI: processor: unify arch_acpi_processor_cleanup_pdc	2009-12-22 03:24:14 -05:00
sleep.c	ACPI: introduce kernel parameter acpi_sleep=sci_force_enable	2009-12-30 18:32:01 -05:00
sleep.h	x86: move suspend wakeup code to C	2008-04-17 17:41:37 +02:00
wakeup_32.S	x86: use _types.h headers in asm where available	2009-02-13 11:35:01 -08:00
wakeup_64.S	Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core	2009-02-24 21:50:43 +01:00
wakeup_rm.S	x86: move suspend wakeup code to C	2008-04-17 17:41:37 +02:00