Merge branch 'linus' into x86/irq
[safe/jmp/linux-2.6] / arch / x86 / kernel / acpi / wakeup_rm.S
2008-04-17 Pavel Machekx86: move suspend wakeup code to C