[IA64] Manual merge fix for 3 files
[pandora-kernel.git] / arch / x86_64 / kernel / suspend_asm.S
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2