Merge by hand (conflicts between pending drivers and kfree cleanups)

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

diff --cc drivers/block/cciss.c
index a97c80b57737528b3e5cf6b1da2f351584dc14ca,482786068ff9630ad0f2605ce8d40e8ab7afcbf3..e239a6c2923052c4271f5d6414d7eec87f85b508
--- 1/drivers/block/cciss.c
--- 2/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@@ -3031,7 -3163,12 +3160,11 @@@ static int __devinit cciss_init_one(str
        return(1);
  
  clean4:
 -      if(hba[i]->cmd_pool_bits)
 -                      kfree(hba[i]->cmd_pool_bits);
+ #ifdef CONFIG_CISS_SCSI_TAPE
+       if(hba[i]->scsi_rejects.complete)
+               kfree(hba[i]->scsi_rejects.complete);
+ #endif
 +      kfree(hba[i]->cmd_pool_bits);
        if(hba[i]->cmd_pool)
                pci_free_consistent(hba[i]->pdev,
                        NR_CMDS * sizeof(CommandList_struct),

diff --cc drivers/scsi/ide-scsi.c
Simple merge

diff --cc drivers/scsi/ips.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_mbox.c
Simple merge

diff --cc drivers/scsi/raid_class.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge