diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 13:40:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 13:40:39 +1000 |
| commit | cfa3f5c4e0c3a43f94818579fba10a9638b5750b (patch) | |
| tree | f924a51caa142259605aabcb7b4ff8d0bd9da483 /arch | |
| parent | 2288e198db435794613ed467a73611fd1f78dc9e (diff) | |
| parent | 5835f25117ef6a56144bfc6be98b5a3cb188bf7a (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index e4c60d6e18b8..ab08d1594339 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -410,7 +410,7 @@ extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; /* * Ensure that there are not more swap files than can be encoded in the kernel - * the PTEs. + * PTEs. */ #define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS) |