Merge ../linux-2.6/

Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/mm/swap.c b/mm/swap.c
index 03ae2076f9..990868afc1 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -86,8 +86,7 @@ int rotate_reclaimable_page(struct page *page)
         zone = page_zone(page);
         spin_lock_irqsave(&zone->lru_lock, flags);
         if (PageLRU(page) && !PageActive(page)) {
-                list_del(&page->lru);
-                list_add_tail(&page->lru, &zone->inactive_list);
+                list_move_tail(&page->lru, &zone->inactive_list);
                 inc_page_state(pgrotated);
         }
         if (!test_clear_page_writeback(page))