Merge branch 'suspend' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:38:15 +0000 (03:38 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:38:15 +0000 (03:38 -0500)
commit3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77
tree82b60e24ce5457e2e21e00bfa3b2f171d7eb97ce
parentd0302bc62af7983040ea1cd1b5dd2b36e1a6a509
parentada9cfdd158abb8169873dc8e5ae39b1ec6ffa8c
Merge branch 'suspend' into release
Documentation/kernel-parameters.txt
drivers/acpi/main.c