Merge branch 'linus' into test

Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index d8b63d164e41..b8e86460046e 100644
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -337,7 +337,7 @@ With scatterlists, you use the resulting mapping like this:
         int i, count = dma_map_sg(dev, sglist, nents, direction);
         struct scatterlist *sg;
 
-        for (i = 0, sg = sglist; i < count; i++, sg++) {
+        for_each_sg(sglist, sg, count, i) {
                 hw_address[i] = sg_dma_address(sg);
                 hw_len[i] = sg_dma_len(sg);
         }