Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-msm / include / mach / entry-macro-qgic.S

diff --git a/arch/arm/mach-msm/include/mach/entry-macro-qgic.S b/arch/arm/mach-msm/include/mach/entry-macro-qgic.S
index 4dc99aa65d075eff2aae7c5005c75461a5d72c3d..12467157afb99f905ac10c8c559af06a37b6e0f7 100644 (file)
--- a/arch/arm/mach-msm/include/mach/entry-macro-qgic.S
+++ b/arch/arm/mach-msm/include/mach/entry-macro-qgic.S
@@ -26,7 +26,7 @@
         * The interrupt numbering scheme is defined in the
         * interrupt controller spec.  To wit:
         *
-        * Migrated the code from ARM MP port to be more consistant
+        * Migrated the code from ARM MP port to be more consistent
         * with interrupt processing , the following still holds true
         * however, all interrupts are treated the same regardless of
         * if they are local IPI or PPI