Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 44f11ee411c..14ec641003d 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -703,7 +703,7 @@ int migrate_platform_irqs(unsigned int cpu)
                                 data->chip->irq_disable(data);
                                 data->chip->irq_set_affinity(data, mask, false);
                                 data->chip->irq_enable(data);
-                                printk ("Re-targetting CPEI to cpu %d\n", new_cpei_cpu);
+                                printk ("Re-targeting CPEI to cpu %d\n", new_cpei_cpu);
                         }
                 }
                 if (!data) {