arch/x86/kernel/acpi/sleep.c · 638bee71c83a2837b48062fdc5b222163cf53d79 · Kirill Smelkov / linux · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge branch 'linus' into x86/apic · f8a6b2b9
Ingo Molnar authored Feb 13, 2009
```
Conflicts:
	arch/x86/kernel/acpi/boot.c
	arch/x86/mm/fault.c
```
f8a6b2b9

sleep.c 4.5 KB