Merge branch 'suspend' into release
Len Brown [Fri, 9 Jan 2009 08:38:15 +0000 (03:38 -0500)]
1  2 
Documentation/kernel-parameters.txt
drivers/acpi/main.c

Simple merge
Simple merge