Merge linux-2.6 with linux-acpi-2.6
[cascardo/linux.git] / Documentation / pm.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2