Merge commit 'v2.6.30-rc1' into sched/urgent

Merge reason: update to latest upstream to queue up fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 5b47d6b65275..cbcd7eb83bd1 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -221,7 +221,7 @@ static void __init ip27_smp_setup(void)
          * Assumption to be fixed: we're always booted on logical / physical
          * processor 0.  While we're always running on logical processor 0
          * this still means this is physical processor zero; it might for
-         * example be disabled in the firwware.
+         * example be disabled in the firmware.
          */
         alloc_cpupda(0, 0);
 }