diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-24 14:11:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-24 14:11:25 +0100 |
| commit | 9e01c22165046c5f1dcea414a8185e196667bc4a (patch) | |
| tree | f0af5de698124c1400e2a59ece8039e689f8492e /Documentation/arm64/memory.txt | |
| parent | 718533b750ffe16571620d7a75807c0179590061 (diff) | |
| parent | 088d7dadf9ce9e4923355f1e9ad02cd130dcfd7e (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-rt-preview-14.05
Diffstat (limited to 'Documentation/arm64/memory.txt')
| -rw-r--r-- | Documentation/arm64/memory.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/arm64/memory.txt b/Documentation/arm64/memory.txt index 7835a54b55b0..c6941f815f15 100644 --- a/Documentation/arm64/memory.txt +++ b/Documentation/arm64/memory.txt @@ -39,7 +39,7 @@ ffffffbffa000000 ffffffbffaffffff 16MB PCI I/O space ffffffbffb000000 ffffffbffbbfffff 12MB [guard] -ffffffbffbc00000 ffffffbffbdfffff 2MB earlyprintk device +ffffffbffbc00000 ffffffbffbdfffff 2MB fixed mappings ffffffbffbe00000 ffffffbffbffffff 2MB [guard] @@ -66,7 +66,7 @@ fffffdfffa000000 fffffdfffaffffff 16MB PCI I/O space fffffdfffb000000 fffffdfffbbfffff 12MB [guard] -fffffdfffbc00000 fffffdfffbdfffff 2MB earlyprintk device +fffffdfffbc00000 fffffdfffbdfffff 2MB fixed mappings fffffdfffbe00000 fffffdfffbffffff 2MB [guard] |