Merge drm/drm-next into drm-misc-next

[linux-2.6-block.git] / mm / page_io.c

diff --git a/mm/page_io.c b/mm/page_io.c
index a39aac2f8c8d6dad03535dbf46f34e6fbfda2752..24ee600f913174c3928b77f2498192e472927da0 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -163,7 +163,7 @@ int generic_swapfile_activate(struct swap_info_struct *sis,
        blocks_per_page = PAGE_SIZE >> blkbits;
 
        /*
-        * Map all the blocks into the extent list.  This code doesn't try
+        * Map all the blocks into the extent tree.  This code doesn't try
         * to be very smart.
         */
        probe_block = 0;