Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6
[linux-2.6] / kernel / power / power.h
2005-09-23  Pavel Machek[PATCH] swsusp: fix comments
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2