Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index cdbdec9f4fb2..83986ed86556 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -526,10 +526,10 @@ struct aac_driver_ident
 
 /*
  *      The adapter interface specs all queues to be located in the same
- *      physically contigous block. The host structure that defines the
+ *      physically contiguous block. The host structure that defines the
  *      commuication queues will assume they are each a separate physically
- *      contigous memory region that will support them all being one big
- *      contigous block.
+ *      contiguous memory region that will support them all being one big
+ *      contiguous block.
  *      There is a command and response queue for each level and direction of
  *      commuication. These regions are accessed by both the host and adapter.
  */
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index d598eba630d0..666d5151d628 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -226,7 +226,7 @@ static int aac_comm_init(struct aac_dev * dev)
         spin_lock_init(&dev->fib_lock);
 
         /*
-         *      Allocate the physically contigous space for the commuication
+         *      Allocate the physically contiguous space for the commuication
          *      queue headers. 
          */