[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, 0 insertions, 8 deletions

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 114738a45582..74eef7111f2b 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -102,14 +102,6 @@ config HIGHPTE
           with a lot of RAM, this can be wasteful of precious low memory.
           Setting this option will put user-space page tables in high memory.
 
-config LARGE_ALLOCS
-        bool "Allow allocating large blocks (> 1MB) of memory"
-        help
-          Allow the slab memory allocator to keep chains for very large memory
-          sizes - up to 32MB. You may need this if your system has a lot of
-          RAM, and you need to able to allocate very large contiguous chunks.
-          If unsure, say N.
-
 source "mm/Kconfig"
 
 choice