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

4 files changed, 15 insertions, 7 deletions

diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S
index 1559dea36e55..1359ee659574 100644
--- a/arch/m68k/kernel/entry_mm.S
+++ b/arch/m68k/kernel/entry_mm.S
@@ -750,4 +750,8 @@ sys_call_table:
         .long sys_fanotify_init
         .long sys_fanotify_mark
         .long sys_prlimit64
+        .long sys_name_to_handle_at     /* 340 */
+        .long sys_open_by_handle_at
+        .long sys_clock_adjtime
+        .long sys_syncfs
 
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index ef54128baa0b..27622b3273c1 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -134,7 +134,7 @@
  *      Thanks to a small helping routine enabling the mmu got quite simple
  * and there is only one way left. mmu_engage makes a complete a new mapping
  * that only includes the absolute necessary to be able to jump to the final
- * postion and to restore the original mapping.
+ * position and to restore the original mapping.
  * As this code doesn't need a transparent translation register anymore this
  * means all registers are free to be used by machines that needs them for
  * other purposes.
@@ -969,7 +969,7 @@ L(mmu_init_amiga):
         is_not_040_or_060(1f)
 
         /*
-         * 040: Map the 16Meg range physical 0x0 upto logical 0x8000.0000
+         * 040: Map the 16Meg range physical 0x0 up to logical 0x8000.0000
          */
         mmu_map         #0x80000000,#0,#0x01000000,#_PAGE_NOCACHE_S
         /*
@@ -982,7 +982,7 @@ L(mmu_init_amiga):
 
 1:
         /*
-         * 030: Map the 32Meg range physical 0x0 upto logical 0x8000.0000
+         * 030: Map the 32Meg range physical 0x0 up to logical 0x8000.0000
          */
         mmu_map         #0x80000000,#0,#0x02000000,#_PAGE_NOCACHE030
         mmu_map_tt      #1,#0x40000000,#0x20000000,#_PAGE_NOCACHE030
@@ -1074,7 +1074,7 @@ L(notq40):
         is_040(1f)
 
         /*
-         * 030: Map the 32Meg range physical 0x0 upto logical 0xf000.0000
+         * 030: Map the 32Meg range physical 0x0 up to logical 0xf000.0000
          */
         mmu_map #0xf0000000,#0,#0x02000000,#_PAGE_NOCACHE030
 
@@ -1082,7 +1082,7 @@ L(notq40):
 
 1:
         /*
-         * 040: Map the 16Meg range physical 0x0 upto logical 0xf000.0000
+         * 040: Map the 16Meg range physical 0x0 up to logical 0xf000.0000
          */
         mmu_map #0xf0000000,#0,#0x01000000,#_PAGE_NOCACHE_S
 
@@ -3078,7 +3078,7 @@ func_start	serial_putc,%d0/%d1/%a0/%a1
         /*
          * If the loader gave us a board type then we can use that to
          * select an appropriate output routine; otherwise we just use
-         * the Bug code.  If we haev to use the Bug that means the Bug
+         * the Bug code.  If we have to use the Bug that means the Bug
          * workspace has to be valid, which means the Bug has to use
          * the SRAM, which is non-standard.
          */
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S
index 79b1ed198c07..9b8393d8adb8 100644
--- a/arch/m68k/kernel/syscalltable.S
+++ b/arch/m68k/kernel/syscalltable.S
@@ -358,6 +358,10 @@ ENTRY(sys_call_table)
         .long sys_fanotify_init
         .long sys_fanotify_mark
         .long sys_prlimit64
+        .long sys_name_to_handle_at     /* 340 */
+        .long sys_open_by_handle_at
+        .long sys_clock_adjtime
+        .long sys_syncfs
 
         .rept NR_syscalls-(.-sys_call_table)/4
                 .long sys_ni_syscall
diff --git a/arch/m68k/kernel/vmlinux.lds_no.S b/arch/m68k/kernel/vmlinux.lds_no.S
index 47e15ebfd893..f4d715cdca0e 100644
--- a/arch/m68k/kernel/vmlinux.lds_no.S
+++ b/arch/m68k/kernel/vmlinux.lds_no.S
@@ -3,7 +3,7 @@
  *
  *      (C) Copyright 2002-2006, Greg Ungerer <gerg@snapgear.com>
  *
- *      This linker script is equiped to build either ROM loaded or RAM
+ *      This linker script is equipped to build either ROM loaded or RAM
  *      run kernels.
  */