diff options
| author |   Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 13:48:51 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 13:48:51 +0100 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /Documentation/block | |
| parent | cciss: Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (diff) | |
| download | linux-dev-f11cbd74c5ff3614f6390b4de67a6ffdc614c378.tar.xz linux-dev-f11cbd74c5ff3614f6390b4de67a6ffdc614c378.zip | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'Documentation/block')
| -rw-r--r-- | Documentation/block/biodoc.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index 8d2158a1c6aa..6fab97ea7e6b 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt @@ -186,7 +186,7 @@ a virtual address mapping (unlike the earlier scheme of virtual address do not have a corresponding kernel virtual address space mapping) and low-memory pages. -Note: Please refer to Documentation/DMA-mapping.txt for a discussion +Note: Please refer to Documentation/PCI/PCI-DMA-mapping.txt for a discussion on PCI high mem DMA aspects and mapping of scatter gather lists, and support for 64 bit PCI. |