Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix format warning in arch/ia64/kernel/acpi.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 7b897b7b0ae6..90ebceb899a0 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -479,7 +479,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
 
         if (srat_num_cpus >= ARRAY_SIZE(node_cpuid)) {
                 printk_once(KERN_WARNING
-                            "node_cpuid[%d] is too small, may not be able to use all cpus\n",
+                            "node_cpuid[%ld] is too small, may not be able to use all cpus\n",
                             ARRAY_SIZE(node_cpuid));
                 return;
         }