diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-31 17:08:56 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-31 17:08:56 +1100 |
| commit | 4eca3fcfdf693646539b7ec68b717deb8156a5ad (patch) | |
| tree | db56bfb829f290a0590fb6189a83e9a46849db71 /arch/m32r | |
| parent | b48775e087ec3b2066873596d157b05365215298 (diff) | |
| parent | ebd46f016a30ad4cc766540fe89b0974a0278dba (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
net/netfilter/xt_set.c
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/include/asm/mmu_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/include/asm/mmu_context.h b/arch/m32r/include/asm/mmu_context.h index a979a4198168..9fc78fc44445 100644 --- a/arch/m32r/include/asm/mmu_context.h +++ b/arch/m32r/include/asm/mmu_context.h @@ -45,7 +45,7 @@ static inline void get_new_mmu_context(struct mm_struct *mm) Flush all TLB and start new cycle. */ local_flush_tlb_all(); /* Fix version if needed. - Note that we avoid version #0 to distingush NO_CONTEXT. */ + Note that we avoid version #0 to distinguish NO_CONTEXT. */ if (!mc) mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION; } |