Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 77cd65db8500..d97a2caf582b 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -3234,7 +3234,7 @@ prism54_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
         switch (cmd) {
                 case PRISM54_HOSTAPD:
                 if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
+                        return -EPERM;
                 ret = prism54_hostapd(ndev, &wrq->u.data);
                 return ret;
         }
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 2c8cc954d1b6..ec2c75d77cea 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -630,7 +630,7 @@ islpci_alloc_memory(islpci_private *priv)
         printk(KERN_DEBUG "islpci_alloc_memory\n");
 #endif
 
-        /* remap the PCI device base address to accessable */
+        /* remap the PCI device base address to accessible */
         if (!(priv->device_base =
               ioremap(pci_resource_start(priv->pdev, 0),
                       ISL38XX_PCI_MEM_SIZE))) {
@@ -709,7 +709,7 @@ islpci_alloc_memory(islpci_private *priv)
                                    PCI_DMA_FROMDEVICE);
                 if (!priv->pci_map_rx_address[counter]) {
                         /* error mapping the buffer to device
-                           accessable memory address */
+                           accessible memory address */
                         printk(KERN_ERR "failed to map skb DMA'able\n");
                         goto out_free;
                 }
@@ -773,7 +773,7 @@ islpci_free_memory(islpci_private *priv)
                 priv->data_low_rx[counter] = NULL;
         }
 
-        /* Free the acces control list and the WPA list */
+        /* Free the access control list and the WPA list */
         prism54_acl_clean(&priv->acl);
         prism54_wpa_bss_ie_clean(priv);
         mgt_clean(priv);
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 2fc52bc2d7dd..266d45bf86f5 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -113,7 +113,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
          * be aligned on a 4-byte boundary. If WDS is enabled add another 6 bytes
          * and add WDS address information */
         if (likely(((long) skb->data & 0x03) | init_wds)) {
-                /* get the number of bytes to add and re-allign */
+                /* get the number of bytes to add and re-align */
                 offset = (4 - (long) skb->data) & 0x03;
                 offset += init_wds ? 6 : 0;
 
@@ -342,7 +342,7 @@ islpci_eth_receive(islpci_private *priv)
                          priv->pci_map_rx_address[index],
                          MAX_FRAGMENT_SIZE_RX + 2, PCI_DMA_FROMDEVICE);
 
-        /* update the skb structure and allign the buffer */
+        /* update the skb structure and align the buffer */
         skb_put(skb, size);
         if (offset) {
                 /* shift the buffer allocation offset bytes to get the right frame */
@@ -450,7 +450,7 @@ islpci_eth_receive(islpci_private *priv)
                                    MAX_FRAGMENT_SIZE_RX + 2,
                                    PCI_DMA_FROMDEVICE);
                 if (unlikely(!priv->pci_map_rx_address[index])) {
-                        /* error mapping the buffer to device accessable memory address */
+                        /* error mapping the buffer to device accessible memory address */
                         DEBUG(SHOW_ERROR_MESSAGES,
                               "Error mapping DMA address\n");
 
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index dc14420a9adc..b5e64d71b7a6 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -38,7 +38,7 @@ module_param(init_pcitm, int, 0);
 /* In this order: vendor, device, subvendor, subdevice, class, class_mask,
  * driver_data
  * If you have an update for this please contact prism54-devel@prism54.org
- * The latest list can be found at http://prism54.org/supported_cards.php */
+ * The latest list can be found at http://wireless.kernel.org/en/users/Drivers/p54 */
 static DEFINE_PCI_DEVICE_TABLE(prism54_id_tbl) = {
         /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */
         {