diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 16:30:54 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 16:30:54 +0000 |
| commit | e9f2d6d66037cdf97487491e04053f411abc5d16 (patch) | |
| tree | 123cec080d17fb74a2531d8cc7ad1cf44bbad9ec /Documentation/arm | |
| parent | fbe4dd088f449cbae586aa8af51d271297c75f9f (diff) | |
| parent | 06e944b8e5fc4bec83f102f98c1ee4f972f5f072 (diff) | |
| download | linux-e9f2d6d66037cdf97487491e04053f411abc5d16.tar.gz linux-e9f2d6d66037cdf97487491e04053f411abc5d16.tar.bz2 linux-e9f2d6d66037cdf97487491e04053f411abc5d16.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'Documentation/arm')
| -rw-r--r-- | Documentation/arm/memory.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt index 38dc06d0a791..4178ebda6e66 100644 --- a/Documentation/arm/memory.txt +++ b/Documentation/arm/memory.txt @@ -41,7 +41,7 @@ fffe8000 fffeffff DTCM mapping area for platforms with fffe0000 fffe7fff ITCM mapping area for platforms with ITCM mounted inside the CPU. -ffc00000 ffdfffff Fixmap mapping region. Addresses provided +ffc00000 ffefffff Fixmap mapping region. Addresses provided by fix_to_virt() will be located here. fee00000 feffffff Mapping of PCI I/O space. This is a static |