Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
  Documentation: update broken web addresses.
  fix comment typo "choosed" -> "chosen"
  hostap:hostap_hw.c Fix typo in comment
  Fix spelling contorller -> controller in comments
  Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
  fs/Kconfig: Fix typo Userpace -> Userspace
  Removing dead MACH_U300_BS26
  drivers/infiniband: Remove unnecessary casts of private_data
  fs/ocfs2: Remove unnecessary casts of private_data
  libfc: use ARRAY_SIZE
  scsi: bfa: use ARRAY_SIZE
  drm: i915: use ARRAY_SIZE
  drm: drm_edid: use ARRAY_SIZE
  synclink: use ARRAY_SIZE
  block: cciss: use ARRAY_SIZE
  comment typo fixes: charater => character
  fix comment typos concerning "challenge"
  arm: plat-spear: fix typo in kerneldoc
  reiserfs: typo comment fix
  update email address
  ...

13 files changed, 23 insertions, 23 deletions

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 38395dfa4963..70705d1306b9 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -729,14 +729,14 @@ static void mc32_halt_transceiver(struct net_device *dev)
  *      mc32_load_rx_ring       -       load the ring of receive buffers
  *      @dev: 3c527 to build the ring for
  *
- *      This initalises the on-card and driver datastructures to
+ *      This initialises the on-card and driver datastructures to
  *      the point where mc32_start_transceiver() can be called.
  *
  *      The card sets up the receive ring for us. We are required to use the
  *      ring it provides, although the size of the ring is configurable.
  *
  *      We allocate an sk_buff for each ring entry in turn and
- *      initalise its house-keeping info. At the same time, we read
+ *      initialise its house-keeping info. At the same time, we read
  *      each 'next' pointer in our rx_ring array. This reduces slow
  *      shared-memory reads and makes it easy to access predecessor
  *      descriptors.
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index 79636ee35829..0362c8d31a08 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -80,7 +80,7 @@ static struct net_device * __init ipddp_init(void)
         if (version_printed++ == 0)
                 printk(version);
 
-        /* Initalize the device structure. */
+        /* Initialize the device structure. */
         dev->netdev_ops = &ipddp_netdev_ops;
 
         dev->type = ARPHRD_IPDDP;               /* IP over DDP tunnel */
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/benet/be_hw.h
index 6c8f9bb8bfe6..5d38046402b2 100644
--- a/drivers/net/benet/be_hw.h
+++ b/drivers/net/benet/be_hw.h
@@ -52,7 +52,7 @@
  */
 #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK      (1 << 29) /* bit 29 */
 
-/********* Power managment (WOL) **********/
+/********* Power management (WOL) **********/
 #define PCICFG_PM_CONTROL_OFFSET                0x44
 #define PCICFG_PM_CONTROL_MASK                  0x108   /* bits 3 & 8 */
 
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 27f02970d898..a1b6301bc674 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -917,7 +917,7 @@ static void gfar_init_filer_table(struct gfar_private *priv)
         rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_UDP);
         rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_TCP);
 
-        /* cur_filer_idx indicated the fisrt non-masked rule */
+        /* cur_filer_idx indicated the first non-masked rule */
         priv->cur_filer_idx = rqfar;
 
         /* Rest are masked rules */
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index ce587f4c4203..095b17ecf609 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -1072,7 +1072,7 @@ static void hp100_mmuinit(struct net_device *dev)
         if (lp->mode == 1)
                 hp100_init_pdls(dev);
 
-        /* Go to performance page and initalize isr and imr registers */
+        /* Go to performance page and initialize isr and imr registers */
         hp100_page(PERFORMANCE);
         hp100_outw(0xfefe, IRQ_MASK);   /* mask off all ints */
         hp100_outw(0xffff, IRQ_STATUS); /* ack IRQ */
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index b150c102ca5a..0f1d4e96cf89 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1045,7 +1045,7 @@ static int emac_change_mtu(struct net_device *ndev, int new_mtu)
         DBG(dev, "change_mtu(%d)" NL, new_mtu);
 
         if (netif_running(ndev)) {
-                /* Check if we really need to reinitalize RX ring */
+                /* Check if we really need to reinitialize RX ring */
                 if (emac_rx_skb_size(ndev->mtu) != emac_rx_skb_size(new_mtu))
                         ret = emac_resize_rx_ring(dev, new_mtu);
         }
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index 8b32cc107f0f..37504a398906 100644
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -6810,7 +6810,7 @@ static int stp;
 static int fast_aging;
 
 /**
- * netdev_init - initalize network device.
+ * netdev_init - initialize network device.
  * @dev:        Network device.
  *
  * This function initializes the network device.
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index b5c6279cc5a3..4eea3f70c5cf 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -497,7 +497,7 @@ static u32 temac_setoptions(struct net_device *ndev, u32 options)
         return (0);
 }
 
-/* Initilize temac */
+/* Initialize temac */
 static void temac_device_reset(struct net_device *ndev)
 {
         struct temac_local *lp = netdev_priv(ndev);
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 32f2deaa38bb..f5a9eb1df593 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -1376,7 +1376,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)
         bitbang->mdc_msk = 0x01;
         bitbang->ctrl.ops = &bb_ops;
 
-        /* MII contorller setting */
+        /* MII controller setting */
         mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl);
         if (!mdp->mii_bus) {
                 ret = -ENOMEM;
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 29e6c63d39fd..0bc4f3030a80 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -589,7 +589,7 @@ static int dmfe_open(struct DEVICE *dev)
                 db->dm910x_chk_mode = 1;        /* Enter the check mode */
         }
 
-        /* Initilize DM910X board */
+        /* Initialize DM910X board */
         dmfe_init_dm910x(dev);
 
         /* Active System Interface */
@@ -606,9 +606,9 @@ static int dmfe_open(struct DEVICE *dev)
 }
 
 
-/*      Initilize DM910X board
+/*      Initialize DM910X board
  *      Reset DM910X board
- *      Initilize TX/Rx descriptor chain structure
+ *      Initialize TX/Rx descriptor chain structure
  *      Send the set-up frame
  *      Enable Tx/Rx machine
  */
@@ -649,7 +649,7 @@ static void dmfe_init_dm910x(struct DEVICE *dev)
         if ( !(db->media_mode & DMFE_AUTO) )
                 db->op_mode = db->media_mode;   /* Force Mode */
 
-        /* Initiliaze Transmit/Receive decriptor and CR3/4 */
+        /* Initialize Transmit/Receive decriptor and CR3/4 */
         dmfe_descriptor_init(db, ioaddr);
 
         /* Init CR6 to program DM910x operation */
@@ -1288,7 +1288,7 @@ static void dmfe_timer(unsigned long data)
  *      Stop DM910X board
  *      Free Tx/Rx allocated memory
  *      Reset DM910X board
- *      Re-initilize DM910X board
+ *      Re-initialize DM910X board
  */
 
 static void dmfe_dynamic_reset(struct DEVICE *dev)
@@ -1316,7 +1316,7 @@ static void dmfe_dynamic_reset(struct DEVICE *dev)
         netif_carrier_off(dev);
         db->wait_reset = 0;
 
-        /* Re-initilize DM910X board */
+        /* Re-initialize DM910X board */
         dmfe_init_dm910x(dev);
 
         /* Restart upper layer interface */
@@ -1447,7 +1447,7 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr)
 
 /*
  *      Send a setup frame for DM9132
- *      This setup frame initilize DM910X address filter mode
+ *      This setup frame initialize DM910X address filter mode
 */
 
 static void dm9132_id_table(struct DEVICE *dev)
@@ -1489,7 +1489,7 @@ static void dm9132_id_table(struct DEVICE *dev)
 
 /*
  *      Send a setup frame for DM9102/DM9102A
- *      This setup frame initilize DM910X address filter mode
+ *      This setup frame initialize DM910X address filter mode
  */
 
 static void send_filter_frame(struct DEVICE *dev)
@@ -2142,7 +2142,7 @@ static int dmfe_resume(struct pci_dev *pci_dev)
         pci_set_power_state(pci_dev, PCI_D0);
         pci_restore_state(pci_dev);
 
-        /* Re-initilize DM910X board */
+        /* Re-initialize DM910X board */
         dmfe_init_dm910x(dev);
 
         /* Disable WOL */
@@ -2196,7 +2196,7 @@ MODULE_PARM_DESC(SF_mode, "Davicom DM9xxx special function "
 
 /*      Description:
  *      when user used insmod to add module, system invoked init_module()
- *      to initilize and register.
+ *      to initialize and register.
  */
 
 static int __init dmfe_init_module(void)
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index 2f725d0cc762..9fb03082153a 100644
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -50,7 +50,7 @@
  *
  * ROADMAP
  *
- * i2400m_dev_initalize()       Called by i2400m_dev_start()
+ * i2400m_dev_initialize()       Called by i2400m_dev_start()
  *   i2400m_set_init_config()
  *   i2400m_cmd_get_state()
  * i2400m_dev_shutdown()        Called by i2400m_dev_stop()
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 9cadaa296fac..dbb986946e1a 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -1224,7 +1224,7 @@ static void ap_crypt_init(struct ap_data *ap)
 
 
 /* Generate challenge data for shared key authentication. IEEE 802.11 specifies
- * that WEP algorithm is used for generating challange. This should be unique,
+ * that WEP algorithm is used for generating challenge. This should be unique,
  * but otherwise there is not really need for randomness etc. Initialize WEP
  * with pseudo random key and then use increasing IV to get unique challenge
  * streams.
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 2f999fc94f60..e9d9d622a9b0 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -1896,7 +1896,7 @@ fail:
 /* Some SMP systems have reported number of odd errors with hostap_pci. fid
  * register has changed values between consecutive reads for an unknown reason.
  * This should really not happen, so more debugging is needed. This test
- * version is a big slower, but it will detect most of such register changes
+ * version is a bit slower, but it will detect most of such register changes
  * and will try to get the correct fid eventually. */
 #define EXTRA_FID_READ_TESTS