diff --git a/[refs] b/[refs]
index 08a2ec08e5fc..9d1b9143478e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94567ef16bf38e98a7de214694d327feb3ec42d4
+refs/heads/master: d1339df1f46d10e0396c1470f371b0d1b23295ba
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 451f2ffb137b..977895893ed5 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -321,10 +321,10 @@ config SMP
 	  If you don't know what to do here, say N.
 
 config NR_CPUS
-	int "Maximum number of CPUs (2-1024)"
-	range 2 1024
+	int "Maximum number of CPUs (2-4096)"
+	range 2 4096
 	depends on SMP
-	default "1024"
+	default "4096"
 	help
 	  You should set this to the number of CPUs in your system, but
 	  keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but