Merge with Linus' 2.6 tree
[linux-2.6] / kernel / power / power.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2