Merge branch 'master' into upstream

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/libata-scsi.c
	include/linux/pci_ids.h

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 19397453bae7..35b0a6ebd3f5 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -103,7 +103,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
          * This assumes the memory is mapped zero->n, which isnt
          * always true on real computers. It also has some slight problems
          * with the GART on x86-64. I've btw never tried DMA from PCI space
-         * on this platform but don't be suprised if its problematic.
+         * on this platform but don't be surprised if its problematic.
          */
 #ifndef CONFIG_GART_IOMMU
         if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {
@@ -159,7 +159,6 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,
 {
         q->numpending = 0;
         q->dev = dev;
-        INIT_LIST_HEAD(&q->pendingq);
         init_waitqueue_head(&q->cmdready);
         INIT_LIST_HEAD(&q->cmdq);
         init_waitqueue_head(&q->qfull);