|author||Jiri Kosina <firstname.lastname@example.org>||2011-04-26 10:22:15 +0200|
|committer||Jiri Kosina <email@example.com>||2011-04-26 10:22:59 +0200|
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch.
Diffstat (limited to 'arch/sh/include/asm/pgtable_32.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/pgtable_32.h b/arch/sh/include/asm/pgtable_32.h
index b799fe71114..0bce3d81569 100644
@@ -167,7 +167,7 @@ static inline unsigned long copy_ptea_attributes(unsigned long x)
- * Mask of bits that are to be preserved accross pgprot changes.
+ * Mask of bits that are to be preserved across pgprot changes.
#define _PAGE_CHG_MASK \
(PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | \