Merge commit 'v2.6.39-rc6' into x86/cleanups

[pandora-kernel.git] / arch / arm / kernel / swp_emulate.c

diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
index 7a57609..40ee7e5 100644 (file)
--- a/arch/arm/kernel/swp_emulate.c
+++ b/arch/arm/kernel/swp_emulate.c
@@ -158,7 +158,7 @@ static int emulate_swpX(unsigned int address, unsigned int *data,
 
        if (res == 0) {
                /*
-                * Barrier also required between aquiring a lock for a
+                * Barrier also required between acquiring a lock for a
                 * protected resource and accessing the resource. Inserted for
                 * same reason as above.
                 */