Merge branch 'master'; commit 'v2.6.39-rc3' into next

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S
index 3edbd8db6598..79caccea85ca 100644
--- a/arch/blackfin/lib/ins.S
+++ b/arch/blackfin/lib/ins.S
@@ -67,7 +67,7 @@
  *  - DMA version, which do not suffer from this issue. DMA versions have
  *      different name (prefixed by dma_ ), and are located in
  *      ../kernel/bfin_dma_5xx.c
- * Using the dma related functions are recommended for transfering large
+ * Using the dma related functions are recommended for transferring large
  * buffers in/out of FIFOs.
  */
 
diff --git a/arch/blackfin/lib/memmove.S b/arch/blackfin/lib/memmove.S
index 80c240acac60..4eca566237a4 100644
--- a/arch/blackfin/lib/memmove.S
+++ b/arch/blackfin/lib/memmove.S
@@ -60,7 +60,7 @@ ENTRY(_memmove)
         [P0++] = R1;
 
         CC = P2 == 0;             /* any remaining bytes? */
-        P3 = I0;                  /* Ammend P3 to updated ptr. */
+        P3 = I0;                  /* Amend P3 to updated ptr. */
         IF !CC JUMP .Lbytes;
         P3 = I1;
         RTS;