Merge with /shiny/git/linux-2.6/.git
[linux-2.6] / kernel / power / pm.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2