Merge branch 'master' into for-2.6.34

This commit is contained in:
Jens Axboe 2010-02-22 13:48:51 +01:00
commit f11cbd74c5
1704 changed files with 42323 additions and 17034 deletions

View file

@ -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.