Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

18 files changed, 15 insertions, 39 deletions

diff --git a/drivers/isdn/act2000/Kconfig b/drivers/isdn/act2000/Kconfig
index 3fc1a5434ef7..fa2673fc69c2 100644
--- a/drivers/isdn/act2000/Kconfig
+++ b/drivers/isdn/act2000/Kconfig
@@ -1,6 +1,3 @@
-#
-# Config.in for IBM Active 2000 ISDN driver
-#
 config ISDN_DRV_ACT2000
         tristate "IBM Active 2000 support"
         depends on ISA
@@ -10,4 +7,3 @@ config ISDN_DRV_ACT2000
           into the card using a utility which is part of the latest
           isdn4k-utils package. Please read the file
           <file:Documentation/isdn/README.act2000> for more information.
-
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index e1afd60924fb..b2a04755c96a 100644
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -1,6 +1,3 @@
-#
-# Config.in for the CAPI subsystem
-#
 config ISDN_DRV_AVMB1_VERBOSE_REASON
         bool "Verbose reason code reporting"
         default y
@@ -59,4 +56,3 @@ config ISDN_CAPI_CAPIDRV
           the legacy isdn4linux link layer.  If you have a card which is
           supported by a CAPI driver, but still want to use old features like
           ippp interfaces or ttyI emulation, say Y/M here.
-
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 3e6d17f42a98..66b7d7a86474 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -830,7 +830,7 @@ static void handle_controller(_cmsg * cmsg)
                       case 0: break;
                       case 1: s = "unknown class"; break;
                       case 2: s = "unknown function"; break;
-                      default: s = "unkown error"; break;
+                      default: s = "unknown error"; break;
                    }
                    if (s)
                    printk(KERN_INFO "capidrv-%d: %s from controller 0x%x function %d: %s\n",
diff --git a/drivers/isdn/hardware/eicon/di.c b/drivers/isdn/hardware/eicon/di.c
index b029d130eb21..cb14ae3e7154 100644
--- a/drivers/isdn/hardware/eicon/di.c
+++ b/drivers/isdn/hardware/eicon/di.c
@@ -806,7 +806,7 @@ static void xdi_xlog_request (byte Adapter, byte Id,
           DELIVERY - indication entered isdn_rc function
           RNR=...  - application had returned RNR=... after the
                      look ahead callback
-          RNum=0   - aplication had not returned any buffer to copy
+          RNum=0   - application had not returned any buffer to copy
                      this indication and will copy it self
           COMPLETE - XDI had copied the data to the buffers provided
                      bu the application and is about to issue the
diff --git a/drivers/isdn/hardware/eicon/maintidi.c b/drivers/isdn/hardware/eicon/maintidi.c
index 41c26e756452..534978bdf382 100644
--- a/drivers/isdn/hardware/eicon/maintidi.c
+++ b/drivers/isdn/hardware/eicon/maintidi.c
@@ -385,7 +385,7 @@ static int SuperTraceMessageInput (void* hLib) {
                   }
                   break;
                 default:
-                  diva_mnt_internal_dprintf (0, DLI_ERR, "Unknon IDI Ind (DMA mode): %02x", Ind);
+                  diva_mnt_internal_dprintf (0, DLI_ERR, "Unknown IDI Ind (DMA mode): %02x", Ind);
               }
               p += (this_ind_length+1);
               total_length -= (4 + this_ind_length);
@@ -420,7 +420,7 @@ static int SuperTraceMessageInput (void* hLib) {
             }
             break;
           default:
-            diva_mnt_internal_dprintf (0, DLI_ERR, "Unknon IDI Ind: %02x", Ind);
+            diva_mnt_internal_dprintf (0, DLI_ERR, "Unknown IDI Ind: %02x", Ind);
         }
       }
     }
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index fc46a26cb14f..a64bb6c67ba7 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -721,7 +721,7 @@ hfcsusb_setup_bch(struct bchannel *bch, int protocol)
         switch (protocol) {
         case (-1):      /* used for init */
                 bch->state = -1;
-                /* fall trough */
+                /* fall through */
         case (ISDN_P_NONE):
                 if (bch->state == ISDN_P_NONE)
                         return 0; /* already in idle state */
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.h b/drivers/isdn/hardware/mISDN/hfcsusb.h
index 43efe7358fa3..369196adae03 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.h
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.h
@@ -150,7 +150,7 @@ symbolic(struct hfcusb_symbolic_list list[], const int num)
         for (i = 0; list[i].name != NULL; i++)
                 if (list[i].num == num)
                         return list[i].name;
-        return "<unkown USB Error>";
+        return "<unknown USB Error>";
 }
 
 /* USB descriptor need to contain one of the following EndPoint combination: */
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c
index de352a17673a..09095c747110 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -860,7 +860,7 @@ isar_pump_statev_modem(struct isar_ch *ch, u8 devt) {
                 pr_debug("%s: pump stev GSTN CLEAR\n", ch->is->name);
                 break;
         default:
-                pr_info("u%s: nknown pump stev %x\n", ch->is->name, devt);
+                pr_info("u%s: unknown pump stev %x\n", ch->is->name, devt);
                 break;
         }
 }
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index a420b64472e3..aaaeaafd86f4 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -1086,7 +1086,7 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
                         break;
                 default:
                         DBG(HFCUSB_DBG_STATES,
-                               "HFC_USB: hfc_usb_d_l2l1: unkown state : %#x", pr);
+                               "HFC_USB: hfc_usb_d_l2l1: unknown state : %#x", pr);
                         break;
         }
 }
diff --git a/drivers/isdn/hysdn/Kconfig b/drivers/isdn/hysdn/Kconfig
index c9e4231968ef..e86bc6583d71 100644
--- a/drivers/isdn/hysdn/Kconfig
+++ b/drivers/isdn/hysdn/Kconfig
@@ -1,6 +1,3 @@
-#
-# Config.in for HYSDN ISDN driver
-#
 config HYSDN
         tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)"
         depends on m && PROC_FS && PCI
@@ -15,4 +12,3 @@ config HYSDN_CAPI
         depends on HYSDN && ISDN_CAPI
         help
           Say Y here if you like to use Hypercope's CAPI 2.0 interface.
-
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 90b56ed8651f..507e13d9a57c 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1563,7 +1563,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data)
         *(__be32 *)(p +  4) = cpu_to_be32(CISCO_SLARP_KEEPALIVE);
         *(__be32 *)(p +  8) = cpu_to_be32(lp->cisco_myseq);
         *(__be32 *)(p + 12) = cpu_to_be32(lp->cisco_yourseq);
-        *(__be16 *)(p + 16) = cpu_to_be16(0xffff); // reliablity, always 0xffff
+        *(__be16 *)(p + 16) = cpu_to_be16(0xffff); // reliability, always 0xffff
         p += 18;
 
         isdn_net_write_super(lp, skb);
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 642d5aaf53ce..45df6675e8ed 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -836,7 +836,7 @@ isdn_ppp_write(int min, struct file *file, const char __user *buf, int count)
                         unsigned short hl;
                         struct sk_buff *skb;
                         /*
-                         * we need to reserve enought space in front of
+                         * we need to reserve enough space in front of
                          * sk_buff. old call to dev_alloc_skb only reserved
                          * 16 bytes, now we are looking what the driver want
                          */
@@ -1326,7 +1326,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev)
                 struct sk_buff *new_skb;
                 unsigned short hl;
                 /*
-                 * we need to reserve enought space in front of
+                 * we need to reserve enough space in front of
                  * sk_buff. old call to dev_alloc_skb only reserved
                  * 16 bytes, now we are looking what the driver want.
                  */
@@ -1674,7 +1674,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
          * - insert new fragment into the proper sequence slot (once that's done
          *   newfrag will be set to NULL)
          * - reassemble any complete fragment sequence (non-null 'start'
-         *   indicates there is a continguous sequence present)
+         *   indicates there is a contiguous sequence present)
          * - discard any incomplete sequences that are below minseq -- due
          *   to the fact that sender always increment sequence number, if there
          *   is an incomplete sequence below minseq, no new fragments would
diff --git a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c
index 78f7660c1d0e..4c41f191d4e2 100644
--- a/drivers/isdn/i4l/isdn_ttyfax.c
+++ b/drivers/isdn/i4l/isdn_ttyfax.c
@@ -470,7 +470,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info)
                 }
                 return 0;
         }
-        /* BADMUL=value - dummy 0=disable errorchk disabled (treshold multiplier) */
+        /* BADMUL=value - dummy 0=disable errorchk disabled (threshold multiplier) */
         if (!strncmp(p[0], "BADMUL", 6)) {
                 p[0] += 6;
                 switch (*p[0]) {
diff --git a/drivers/isdn/icn/Kconfig b/drivers/isdn/icn/Kconfig
index 89d15eed765e..4534f21a1852 100644
--- a/drivers/isdn/icn/Kconfig
+++ b/drivers/isdn/icn/Kconfig
@@ -1,6 +1,3 @@
-#
-# Config.in for ICN ISDN driver
-#
 config ISDN_DRV_ICN
         tristate "ICN 2B and 4B support"
         depends on ISA
@@ -13,4 +10,3 @@ config ISDN_DRV_ICN
           separately.  See <file:Documentation/isdn/README> and
           <file:Documentation/isdn/README.icn> for more
           information.
-
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 77ee2867c8b4..43ff4d3b046e 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -110,7 +110,7 @@
  * crossconnections and conferences via software if not possible through
  * hardware. If hardware capability is available, hardware is used.
  *
- * Echo: Is generated by CMX and is used to check performane of hard and
+ * Echo: Is generated by CMX and is used to check performance of hard and
  * software CMX.
  *
  * The CMX has special functions for conferences with one, two and more
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index e04bad6c5baf..6d4da6095885 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -725,7 +725,7 @@ tei_id_ver_tout_net(struct FsmInst *fi, int event, void *arg)
         if (tm->rcnt == 1) {
                 if (*debug & DEBUG_L2_TEI)
                         tm->tei_m.printdebug(fi,
-                            "check req for tei %d sucessful\n", tm->l2->tei);
+                            "check req for tei %d successful\n", tm->l2->tei);
                 mISDN_FsmChangeState(fi, ST_TEI_NOP);
         } else if (tm->rcnt > 1) {
                 /* duplicate assignment; remove */
diff --git a/drivers/isdn/pcbit/Kconfig b/drivers/isdn/pcbit/Kconfig
index ffba6eca1244..e9b2dd85d410 100644
--- a/drivers/isdn/pcbit/Kconfig
+++ b/drivers/isdn/pcbit/Kconfig
@@ -1,6 +1,3 @@
-#
-# Config.in for PCBIT ISDN driver
-#
 config ISDN_DRV_PCBIT
         tristate "PCBIT-D support"
         depends on ISA && (BROKEN || X86)
@@ -11,4 +8,3 @@ config ISDN_DRV_PCBIT
           the card using a utility which is distributed separately.  See
           <file:Documentation/isdn/README> and
           <file:Documentation/isdn/README.pcbit> for more information.
-
diff --git a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig
index e6510ca7bf43..7469863a7925 100644
--- a/drivers/isdn/sc/Kconfig
+++ b/drivers/isdn/sc/Kconfig
@@ -1,6 +1,3 @@
-#
-# Config.in for Spellcaster ISDN driver
-#
 config ISDN_DRV_SC
         tristate "Spellcaster support"
         depends on ISA
@@ -9,4 +6,3 @@ config ISDN_DRV_SC
           driver currently builds only in a modularized version.
           To build it, choose M here: the module will be called sc.
           See <file:Documentation/isdn/README.sc> for more information.
-