diff --git a/[refs] b/[refs]
index 711adebde885..50191af7d55a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 819e32377e401669d2c010f1a0ce12fe43ea5261
+refs/heads/master: 97a34eb77c758ff7821c2d29b3b5a84299c93aa1
diff --git a/trunk/Documentation/DMA-mapping.txt b/trunk/Documentation/DMA-mapping.txt
index b49427aa8510..d8347c1fd032 100644
--- a/trunk/Documentation/DMA-mapping.txt
+++ b/trunk/Documentation/DMA-mapping.txt
@@ -317,9 +317,9 @@ you should do:
 
 	cpu_addr = pci_alloc_consistent(pdev, size, &dma_handle);
 
-where pdev is a struct pci_dev *. You should pass NULL for PCI like buses
-where devices don't have struct pci_dev (like ISA, EISA).  This may be
-called in interrupt context. 
+where pdev is a struct pci_dev *. This may be called in interrupt context.
+You should use dma_alloc_coherent (see DMA-API.txt) for buses
+where devices don't have struct pci_dev (like ISA, EISA).
 
 This argument is needed because the DMA translations may be bus
 specific (and often is private to the bus which the device is attached