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
This commit is contained in:
Linus Torvalds 2011-01-13 11:02:55 -08:00
commit 581548db3b

View File

@ -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;
}