Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/cris/arch-v10/lib/old_checksum.c b/arch/cris/arch-v10/lib/old_checksum.c
index 1734b467efa6..8f79163f1394 100644
--- a/arch/cris/arch-v10/lib/old_checksum.c
+++ b/arch/cris/arch-v10/lib/old_checksum.c
@@ -77,7 +77,7 @@ __wsum csum_partial(const void *p, int len, __wsum __sum)
                 sum += *buff++;
 
         if (endMarker > buff)
-                sum += *(const u8 *)buff;       /* add extra byte seperately */
+                sum += *(const u8 *)buff;       /* add extra byte separately */
 
         BITOFF;
         return (__force __wsum)sum;
diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c
index 6779bcb28ab0..c030d020660a 100644
--- a/arch/cris/arch-v32/mm/tlb.c
+++ b/arch/cris/arch-v32/mm/tlb.c
@@ -189,7 +189,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
                 spin_unlock(&mmu_context_lock);
 
                 /*
-                 * Remember the pgd for the fault handlers. Keep a seperate
+                 * Remember the pgd for the fault handlers. Keep a separate
                  * copy of it because current and active_mm might be invalid
                  * at points where * there's still a need to derefer the pgd.
                  */