[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 145bb824b2a8..5ce94430c019 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -428,12 +428,15 @@ config NR_CPUS
           memory in the static kernel configuration.
 
 config HOTPLUG_CPU
-        bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+        bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
         depends on SMP && HOTPLUG && EXPERIMENTAL
         help
                 Say Y here to experiment with turning CPUs off and on.  CPUs
                 can be controlled through /sys/devices/system/cpu/cpu#.
-                Say N if you want to disable CPU hotplug.
+                This is also required for suspend/hibernation on SMP systems.
+
+                Say N if you want to disable CPU hotplug and don't need to
+                suspend.
 
 config ARCH_ENABLE_MEMORY_HOTPLUG
         def_bool y