Merge 'acpi-2.6.12' branch into to-akpm
[powerpc.git] / drivers / parisc / power.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2