Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 9ac4e378992e..3aadded05a05 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -599,7 +599,7 @@ static const struct ich_laptop ich_laptop[] = {
         { 0x27DF, 0x1028, 0x02b0 },     /* ICH7 on unknown Dell */
         { 0x27DF, 0x1043, 0x1267 },     /* ICH7 on Asus W5F */
         { 0x27DF, 0x103C, 0x30A1 },     /* ICH7 on HP Compaq nc2400 */
-        { 0x27DF, 0x103C, 0x361a },     /* ICH7 on unkown HP  */
+        { 0x27DF, 0x103C, 0x361a },     /* ICH7 on unknown HP  */
         { 0x27DF, 0x1071, 0xD221 },     /* ICH7 on Hercules EC-900 */
         { 0x27DF, 0x152D, 0x0778 },     /* ICH7 on unknown Intel */
         { 0x24CA, 0x1025, 0x0061 },     /* ICH4 on ACER Aspire 2023WLMi */
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index bbbb1fab1755..d210ef2d5608 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -736,7 +736,7 @@ unsigned int ata_sff_data_xfer(struct ata_device *dev, unsigned char *buf,
 
                 /*
                  * Use io*16_rep() accessors here as well to avoid pointlessly
-                 * swapping bytes to and fro on the big endian machines...
+                 * swapping bytes to and from on the big endian machines...
                  */
                 if (rw == READ) {
                         ioread16_rep(data_addr, pad, 1);
@@ -776,7 +776,7 @@ unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf,
         void __iomem *data_addr = ap->ioaddr.data_addr;
         unsigned int words = buflen >> 2;
         int slop = buflen & 3;
-        
+
         if (!(ap->pflags & ATA_PFLAG_PIO32))
                 return ata_sff_data_xfer(dev, buf, buflen, rw);
 
@@ -795,7 +795,7 @@ unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf,
 
                 /*
                  * Use io*_rep() accessors here as well to avoid pointlessly
-                 * swapping bytes to and fro on the big endian machines...
+                 * swapping bytes to and from on the big endian machines...
                  */
                 if (rw == READ) {
                         if (slop < 3)
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 403f56165cec..71cef9a962d4 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -4,7 +4,7 @@
  *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * based upon cs5535.c from AMD <Jens.Altmann@amd.com> as cleaned up and
- * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de
+ * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de>
  * and Alexander Kiausch <alex.kiausch@t-online.de>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 172b57e6543f..e295f86b3f70 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -43,9 +43,9 @@ enum {
         /*
          * SATA-FSL host controller supports a max. of (15+1) direct PRDEs, and
          * chained indirect PRDEs upto a max count of 63.
-         * We are allocating an array of 63 PRDEs contigiously, but PRDE#15 will
+         * We are allocating an array of 63 PRDEs contiguously, but PRDE#15 will
          * be setup as an indirect descriptor, pointing to it's next
-         * (contigious) PRDE. Though chained indirect PRDE arrays are
+         * (contiguous) PRDE. Though chained indirect PRDE arrays are
          * supported,it will be more efficient to use a direct PRDT and
          * a single chain/link to indirect PRDE array/PRDT.
          */
@@ -314,7 +314,7 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc,
         u32 ttl_dwords = 0;
 
         /*
-         * NOTE : direct & indirect prdt's are contigiously allocated
+         * NOTE : direct & indirect prdt's are contiguously allocated
          */
         struct prde *prd = (struct prde *)&((struct command_desc *)
                                             cmd_desc)->prdt;