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/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 6ab035590ee6..b28712df0b77 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -5118,8 +5118,7 @@ static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp)
                 cp->host_status &= ~HS_SKIPMASK;
                 cp->start.schedule.l_paddr = 
                         cpu_to_scr(NCB_SCRIPT_PHYS (np, select));
-                list_del(&cp->link_ccbq);
-                list_add_tail(&cp->link_ccbq, &lp->skip_ccbq);
+                list_move_tail(&cp->link_ccbq, &lp->skip_ccbq);
                 if (cp->queued) {
                         --lp->queuedccbs;
                 }