Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into home.osdl.org:/home/torvalds/v2.5/linux

arch/arm/common/amba.c

@@ -50,7 +50,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf,
 	if (nr_env < 2)
 		return -ENOMEM;
 
-	snprintf(buf, bufsz, "AMBA_ID=%08lx", pcdev->periphid);
+	snprintf(buf, bufsz, "AMBA_ID=%08x", pcdev->periphid);
 	*envp++ = buf;
 	*envp++ = NULL;
 	return 0;

arch/arm/kernel/time.c

@@ -116,7 +116,7 @@ static inline void do_set_rtc(void)
 		return;
 
 	if (next_rtc_update &&
-	    time_before(xtime.tv_sec, next_rtc_update))
+	    time_before((unsigned long)xtime.tv_sec, next_rtc_update))
 		return;
 
 	if (xtime.tv_nsec < 500000000 - ((unsigned) tick_nsec >> 1) &&

arch/arm/mach-sa1100/generic.c

@@ -159,9 +159,14 @@ static struct resource sa11x0mcp_resources[] = {
 	},
 };
 
+static u64 sa11x0mcp_dma_mask = 0xffffffffUL;
+
 static struct platform_device sa11x0mcp_device = {
 	.name		= "sa11x0-mcp",
 	.id		= 0,
+	.dev = {
+		.dma_mask = &sa11x0mcp_dma_mask,
+	},
 	.num_resources	= ARRAY_SIZE(sa11x0mcp_resources),
 	.resource	= sa11x0mcp_resources,
 };

arch/arm/mm/Kconfig

@@ -291,8 +291,8 @@ config ARM_THUMB
 	depends on CPU_ARM720T || CPU_ARM920T || CPU_ARM922T || CPU_ARM926T || CPU_ARM1020 || CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || CPU_XSCALE
 	default y
 	help
-	  Say Y if you want to have kernel support for ARM Thumb instructions,
-	  fault handlers, and system calls.
+	  Say Y if you want to include kernel support for running user space
+	  Thumb binaries.
 
 	  The Thumb instruction set is a compressed form of the standard ARM
 	  instruction set resulting in smaller binaries at the expense of