Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/p54/p54common.c

172 files changed, 1291 insertions, 1436 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index d38f43f593d4..2f557f570ade 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -68,6 +68,8 @@ source "drivers/ssb/Kconfig"
 
 source "drivers/mfd/Kconfig"
 
+source "drivers/regulator/Kconfig"
+
 source "drivers/media/Kconfig"
 
 source "drivers/video/Kconfig"
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index aeadd00411a1..a67b8e7c712d 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -49,6 +49,17 @@
 #define DRV_NAME        "ahci"
 #define DRV_VERSION     "3.0"
 
+/* Enclosure Management Control */
+#define EM_CTRL_MSG_TYPE              0x000f0000
+
+/* Enclosure Management LED Message Type */
+#define EM_MSG_LED_HBA_PORT           0x0000000f
+#define EM_MSG_LED_PMP_SLOT           0x0000ff00
+#define EM_MSG_LED_VALUE              0xffff0000
+#define EM_MSG_LED_VALUE_ACTIVITY     0x00070000
+#define EM_MSG_LED_VALUE_OFF          0xfff80000
+#define EM_MSG_LED_VALUE_ON           0x00010000
+
 static int ahci_skip_host_reset;
 module_param_named(skip_host_reset, ahci_skip_host_reset, int, 0444);
 MODULE_PARM_DESC(skip_host_reset, "skip global host reset (0=don't skip, 1=skip)");
@@ -588,6 +599,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },        /* 6145 */
         { PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },        /* 6121 */
 
+        /* Promise */
+        { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },   /* PDC42819 */
+
         /* Generic, PCI class code for AHCI */
         { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
           PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
@@ -1220,18 +1234,20 @@ static void ahci_sw_activity_blink(unsigned long arg)
         struct ahci_em_priv *emp = &pp->em_priv[link->pmp];
         unsigned long led_message = emp->led_state;
         u32 activity_led_state;
+        unsigned long flags;
 
-        led_message &= 0xffff0000;
+        led_message &= EM_MSG_LED_VALUE;
         led_message |= ap->port_no | (link->pmp << 8);
 
         /* check to see if we've had activity.  If so,
          * toggle state of LED and reset timer.  If not,
          * turn LED to desired idle state.
          */
+        spin_lock_irqsave(ap->lock, flags);
         if (emp->saved_activity != emp->activity) {
                 emp->saved_activity = emp->activity;
                 /* get the current LED state */
-                activity_led_state = led_message & 0x00010000;
+                activity_led_state = led_message & EM_MSG_LED_VALUE_ON;
 
                 if (activity_led_state)
                         activity_led_state = 0;
@@ -1239,17 +1255,18 @@ static void ahci_sw_activity_blink(unsigned long arg)
                         activity_led_state = 1;
 
                 /* clear old state */
-                led_message &= 0xfff8ffff;
+                led_message &= ~EM_MSG_LED_VALUE_ACTIVITY;
 
                 /* toggle state */
                 led_message |= (activity_led_state << 16);
                 mod_timer(&emp->timer, jiffies + msecs_to_jiffies(100));
         } else {
                 /* switch to idle */
-                led_message &= 0xfff8ffff;
+                led_message &= ~EM_MSG_LED_VALUE_ACTIVITY;
                 if (emp->blink_policy == BLINK_OFF)
                         led_message |= (1 << 16);
         }
+        spin_unlock_irqrestore(ap->lock, flags);
         ahci_transmit_led_message(ap, led_message, 4);
 }
 
@@ -1294,7 +1311,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state,
         struct ahci_em_priv *emp;
 
         /* get the slot number from the message */
-        pmp = (state & 0x0000ff00) >> 8;
+        pmp = (state & EM_MSG_LED_PMP_SLOT) >> 8;
         if (pmp < MAX_SLOTS)
                 emp = &pp->em_priv[pmp];
         else
@@ -1319,7 +1336,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state,
         message[0] |= (4 << 8);
 
         /* ignore 0:4 of byte zero, fill in port info yourself */
-        message[1] = ((state & 0xfffffff0) | ap->port_no);
+        message[1] = ((state & ~EM_MSG_LED_HBA_PORT) | ap->port_no);
 
         /* write message to EM_LOC */
         writel(message[0], mmio + hpriv->em_loc);
@@ -1362,7 +1379,7 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf,
         state = simple_strtoul(buf, NULL, 0);
 
         /* get the slot number from the message */
-        pmp = (state & 0x0000ff00) >> 8;
+        pmp = (state & EM_MSG_LED_PMP_SLOT) >> 8;
         if (pmp < MAX_SLOTS)
                 emp = &pp->em_priv[pmp];
         else
@@ -1373,7 +1390,7 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf,
          * activity led through em_message
          */
         if (emp->blink_policy)
-                state &= 0xfff8ffff;
+                state &= ~EM_MSG_LED_VALUE_ACTIVITY;
 
         return ahci_transmit_led_message(ap, state, size);
 }
@@ -1392,16 +1409,16 @@ static ssize_t ahci_activity_store(struct ata_device *dev, enum sw_activity val)
                 link->flags &= ~(ATA_LFLAG_SW_ACTIVITY);
 
                 /* set the LED to OFF */
-                port_led_state &= 0xfff80000;
+                port_led_state &= EM_MSG_LED_VALUE_OFF;
                 port_led_state |= (ap->port_no | (link->pmp << 8));
                 ahci_transmit_led_message(ap, port_led_state, 4);
         } else {
                 link->flags |= ATA_LFLAG_SW_ACTIVITY;
                 if (val == BLINK_OFF) {
                         /* set LED to ON for idle */
-                        port_led_state &= 0xfff80000;
+                        port_led_state &= EM_MSG_LED_VALUE_OFF;
                         port_led_state |= (ap->port_no | (link->pmp << 8));
-                        port_led_state |= 0x00010000; /* check this */
+                        port_led_state |= EM_MSG_LED_VALUE_ON; /* check this */
                         ahci_transmit_led_message(ap, port_led_state, 4);
                 }
         }
@@ -2612,7 +2629,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 u32 em_loc = readl(mmio + HOST_EM_LOC);
                 u32 em_ctl = readl(mmio + HOST_EM_CTL);
 
-                messages = (em_ctl & 0x000f0000) >> 16;
+                messages = (em_ctl & EM_CTRL_MSG_TYPE) >> 16;
 
                 /* we only support LED message type right now */
                 if ((messages & 0x01) && (ahci_em_messages == 1)) {
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 75a406f5e694..5c33767e66de 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -1,6 +1,6 @@
 /*
  *  ata_generic.c - Generic PATA/SATA controller driver.
- *  Copyright 2005 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *  Copyright 2005 Red Hat Inc, all rights reserved.
  *
  *  Elements from ide/pci/generic.c
  *          Copyright (C) 2001-2002     Andre Hedrick <andre@linux-ide.org>
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e9e32ed6b1a3..52dc2d8b8f22 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -14,7 +14,7 @@
  *
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003 Red Hat Inc <alan@redhat.com>
+ *  Copyright (C) 2003 Red Hat Inc
  *
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 8cb0b360bfd8..2ff633c119e2 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4156,29 +4156,33 @@ static int cable_is_40wire(struct ata_port *ap)
         struct ata_link *link;
         struct ata_device *dev;
 
-        /* If the controller thinks we are 40 wire, we are */
+        /* If the controller thinks we are 40 wire, we are. */
         if (ap->cbl == ATA_CBL_PATA40)
                 return 1;
-        /* If the controller thinks we are 80 wire, we are */
+
+        /* If the controller thinks we are 80 wire, we are. */
         if (ap->cbl == ATA_CBL_PATA80 || ap->cbl == ATA_CBL_SATA)
                 return 0;
-        /* If the system is known to be 40 wire short cable (eg laptop),
-           then we allow 80 wire modes even if the drive isn't sure */
+
+        /* If the system is known to be 40 wire short cable (eg
+         * laptop), then we allow 80 wire modes even if the drive
+         * isn't sure.
+         */
         if (ap->cbl == ATA_CBL_PATA40_SHORT)
                 return 0;
-        /* If the controller doesn't know we scan
-
-           - Note: We look for all 40 wire detects at this point.
-             Any 80 wire detect is taken to be 80 wire cable
-             because
-             - In many setups only the one drive (slave if present)
-               will give a valid detect
-             - If you have a non detect capable drive you don't
-               want it to colour the choice
-        */
+
+        /* If the controller doesn't know, we scan.
+         *
+         * Note: We look for all 40 wire detects at this point.  Any
+         *       80 wire detect is taken to be 80 wire cable because
+         * - in many setups only the one drive (slave if present) will
+         *   give a valid detect
+         * - if you have a non detect capable drive you don't want it
+         *   to colour the choice
+         */
         ata_port_for_each_link(link, ap) {
                 ata_link_for_each_dev(dev, link) {
-                        if (!ata_is_40wire(dev))
+                        if (ata_dev_enabled(dev) && !ata_is_40wire(dev))
                                 return 0;
                 }
         }
@@ -4553,6 +4557,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
 /**
  *      ata_qc_new_init - Request an available ATA command, and initialize it
  *      @dev: Device from whom we request an available command structure
+ *      @tag: command tag
  *
  *      LOCKING:
  *      None.
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 5d687d7cffae..8077bdf5d30d 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -603,6 +603,9 @@ void ata_scsi_error(struct Scsi_Host *host)
                         ata_link_for_each_dev(dev, link) {
                                 int devno = dev->devno;
 
+                                if (!ata_dev_enabled(dev))
+                                        continue;
+
                                 ehc->saved_xfer_mode[devno] = dev->xfer_mode;
                                 if (ata_ncq_enabled(dev))
                                         ehc->saved_ncq_enabled |= 1 << devno;
@@ -1161,6 +1164,7 @@ void ata_eh_detach_dev(struct ata_device *dev)
 {
         struct ata_link *link = dev->link;
         struct ata_port *ap = link->ap;
+        struct ata_eh_context *ehc = &link->eh_context;
         unsigned long flags;
 
         ata_dev_disable(dev);
@@ -1174,9 +1178,11 @@ void ata_eh_detach_dev(struct ata_device *dev)
                 ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG;
         }
 
-        /* clear per-dev EH actions */
+        /* clear per-dev EH info */
         ata_eh_clear_action(link, dev, &link->eh_info, ATA_EH_PERDEV_MASK);
         ata_eh_clear_action(link, dev, &link->eh_context.i, ATA_EH_PERDEV_MASK);
+        ehc->saved_xfer_mode[dev->devno] = 0;
+        ehc->saved_ncq_enabled &= ~(1 << dev->devno);
 
         spin_unlock_irqrestore(ap->lock, flags);
 }
@@ -2787,6 +2793,9 @@ int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
 
         /* if data transfer is verified, clear DUBIOUS_XFER on ering top */
         ata_link_for_each_dev(dev, link) {
+                if (!ata_dev_enabled(dev))
+                        continue;
+
                 if (!(dev->flags & ATA_DFLAG_DUBIOUS_XFER)) {
                         struct ata_ering_entry *ent;
 
@@ -2808,6 +2817,9 @@ int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
                 u8 saved_xfer_mode = ehc->saved_xfer_mode[dev->devno];
                 u8 saved_ncq = !!(ehc->saved_ncq_enabled & (1 << dev->devno));
 
+                if (!ata_dev_enabled(dev))
+                        continue;
+
                 if (dev->xfer_mode != saved_xfer_mode ||
                     ata_ncq_enabled(dev) != saved_ncq)
                         dev->flags |= ATA_DFLAG_DUBIOUS_XFER;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 4b95c4387e9e..bbb30d882f05 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1107,6 +1107,15 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
 
                 depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id));
                 depth = min(ATA_MAX_QUEUE - 1, depth);
+
+                /*
+                 * If this device is behind a port multiplier, we have
+                 * to share the tag map between all devices on that PMP.
+                 * Set up the shared tag map here and we get automatic.
+                 */
+                if (dev->link->ap->pmp_link)
+                        scsi_init_shared_tag_map(sdev->host, ATA_MAX_QUEUE - 1);
+
                 scsi_set_tag_type(sdev, MSG_SIMPLE_TAG);
                 scsi_activate_tcq(sdev, depth);
         }
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index eb919c16a03e..e2e332d8ff95 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -1,7 +1,7 @@
 /*
  *      ACPI PATA driver
  *
- *      (c) 2007 Red Hat  <alan@redhat.com>
+ *      (c) 2007 Red Hat
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 5ca70fa1f587..73c466e452ca 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -1,7 +1,6 @@
 /*
  * pata_ali.c   - ALI 15x3 PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * based in part upon
  * linux/drivers/ide/pci/alim15x3.c             Version 0.17    2003/01/02
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 57dd00f463d3..0ec9c7d9fe9d 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -1,7 +1,6 @@
 /*
  * pata_amd.c   - AMD PATA for new ATA layer
  *                        (C) 2005-2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  *  Based on pata-sil680. Errata information is taken from data sheets
  *  and the amd74xx.c driver by Vojtech Pavlik. Nvidia SATA devices are
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 0f513bc11193..6b3092c75ffe 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -1,7 +1,7 @@
 /*
  *    pata_artop.c - ARTOP ATA controller driver
  *
- *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2006 Red Hat
  *      (C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based in part on drivers/ide/pci/aec62xx.c
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index e8a0d99d7356..0e2cde8f9973 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -1,7 +1,6 @@
 /*
  * pata_atiixp.c        - ATI PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Based on
  *
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 2de30b990278..34a394264c3d 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -1,7 +1,6 @@
 /*
  * pata_cmd640.c        - CMD640 PCI PATA for new ATA layer
  *                        (C) 2007 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Based upon
  *  linux/drivers/ide/pci/cmd640.c              Version 1.02  Sep 01, 1996
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index ddd09b7d98c9..3167d8fed2f2 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -1,7 +1,7 @@
 /*
  * pata_cmd64x.c        - CMD64x PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * Based upon
  * linux/drivers/ide/pci/cmd64x.c               Version 1.30    Sept 10, 2002
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 0c4b271a9d5a..bba453381f44 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -1,7 +1,6 @@
 /*
  * pata-cs5530.c        - CS5530 PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * based upon cs5530.c by Mark Lord.
  *
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index f1b6556f0483..1b2d4a0f5f74 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -1,7 +1,7 @@
 /*
  * pata-cs5535.c        - CS5535 PATA for new ATA layer
  *                        (C) 2005-2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        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
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 2ff62608ae37..d546425cd380 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -1,7 +1,7 @@
 /*
  * pata_cypress.c       - Cypress PATA for new ATA layer
  *                        (C) 2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox
  *
  * Based heavily on
  * linux/drivers/ide/pci/cy82c693.c             Version 0.40    Sep. 10, 2002
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 9fba82976ba6..ac6392ea35b0 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -1,7 +1,7 @@
 /*
  *    pata_efar.c - EFAR PIIX clone controller driver
  *
- *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2005 Red Hat
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 6a111baab523..15cdb9148aab 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -1,7 +1,7 @@
 
 /*
  *   pata-isapnp.c - ISA PnP PATA controller driver.
- *   Copyright 2005/2006 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005/2006 Red Hat Inc, all rights reserved.
  *
  *   Based in part on ide-pnp.c by Andrey Panin <pazke@donpac.ru>
  */
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 0221c9a46769..860ede526282 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -1,7 +1,7 @@
 /*
  * pata_it821x.c        - IT821x PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *                        (C) 2007 Bartlomiej Zolnierkiewicz
  *
  * based upon
@@ -10,7 +10,7 @@
  *
  * linux/drivers/ide/pci/it821x.c               Version 0.09    December 2004
  *
- * Copyright (C) 2004           Red Hat <alan@redhat.com>
+ * Copyright (C) 2004           Red Hat
  *
  *  May be copied or modified under the terms of the GNU General Public License
  *  Based in part on the ITE vendor provided SCSI driver.
@@ -557,9 +557,8 @@ static unsigned int it821x_read_id(struct ata_device *adev,
         if (strstr(model_num, "Integrated Technology Express")) {
                 /* Set feature bits the firmware neglects */
                 id[49] |= 0x0300;       /* LBA, DMA */
-                id[82] |= 0x0400;       /* LBA48 */
                 id[83] &= 0x7FFF;
-                id[83] |= 0x4000;       /* Word 83 is valid */
+                id[83] |= 0x4400;       /* Word 83 is valid and LBA48 */
                 id[86] |= 0x0400;       /* LBA48 on */
                 id[ATA_ID_MAJOR_VER] |= 0x1F;
         }
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 73b7596816b4..38cf1ab2d289 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -4,7 +4,7 @@
  *                      driven by AHCI in the usual configuration although
  *                      this driver can handle other setups if we need it.
  *
- *      (c) 2006 Red Hat  <alan@redhat.com>
+ *      (c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index bc037ffce200..930c2208640b 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -1,6 +1,6 @@
 /*
  *   pata-legacy.c - Legacy port PATA/SATA controller driver.
- *   Copyright 2005/2006 Red Hat <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005/2006 Red Hat, all rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 0d87eec84966..76e399bf8c1b 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -5,7 +5,7 @@
  *      isn't making full use of the device functionality but it is
  *      easy to get working.
  *
- *      (c) 2006 Red Hat  <alan@redhat.com>
+ *      (c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 7d7e3fdab71f..7c8faa48b5f3 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -1,7 +1,7 @@
 /*
  * pata_mpiix.c         - Intel MPIIX PATA for new ATA layer
  *                        (C) 2005-2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * The MPIIX is different enough to the PIIX4 and friends that we give it
  * a separate driver. The old ide/pci code handles this by just not tuning
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index d9719c8b9dbe..9dc05e1656a8 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -1,7 +1,7 @@
 /*
  *    pata_netcell.c - Netcell PATA driver
  *
- *      (c) 2006 Red Hat  <alan@redhat.com>
+ *      (c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index 565e67cd13fa..4e466eae8b46 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -1,7 +1,6 @@
 /*
  * pata_ninja32.c       - Ninja32 PATA for new ATA layer
  *                        (C) 2007 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Note: The controller like many controllers has shared timings for
  * PIO and DMA. We thus flip to the DMA timings in dma_start and flip back
@@ -45,7 +44,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_ninja32"
-#define DRV_VERSION "0.0.1"
+#define DRV_VERSION "0.1.1"
 
 
 /**
@@ -89,6 +88,17 @@ static struct ata_port_operations ninja32_port_ops = {
         .set_piomode    = ninja32_set_piomode,
 };
 
+static void ninja32_program(void __iomem *base)
+{
+        iowrite8(0x05, base + 0x01);    /* Enable interrupt lines */
+        iowrite8(0xBE, base + 0x02);    /* Burst, ?? setup */
+        iowrite8(0x01, base + 0x03);    /* Unknown */
+        iowrite8(0x20, base + 0x04);    /* WAIT0 */
+        iowrite8(0x8f, base + 0x05);    /* Unknown */
+        iowrite8(0xa4, base + 0x1c);    /* Unknown */
+        iowrite8(0x83, base + 0x1d);    /* BMDMA control: WAIT0 */
+}
+
 static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         struct ata_host *host;
@@ -134,18 +144,28 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         ap->ioaddr.bmdma_addr = base;
         ata_sff_std_ports(&ap->ioaddr);
 
-        iowrite8(0x05, base + 0x01);    /* Enable interrupt lines */
-        iowrite8(0xBE, base + 0x02);    /* Burst, ?? setup */
-        iowrite8(0x01, base + 0x03);    /* Unknown */
-        iowrite8(0x20, base + 0x04);    /* WAIT0 */
-        iowrite8(0x8f, base + 0x05);    /* Unknown */
-        iowrite8(0xa4, base + 0x1c);    /* Unknown */
-        iowrite8(0x83, base + 0x1d);    /* BMDMA control: WAIT0 */
+        ninja32_program(base);
         /* FIXME: Should we disable them at remove ? */
         return ata_host_activate(host, dev->irq, ata_sff_interrupt,
                                  IRQF_SHARED, &ninja32_sht);
 }
 
+#ifdef CONFIG_PM
+
+static int ninja32_reinit_one(struct pci_dev *pdev)
+{
+        struct ata_host *host = dev_get_drvdata(&pdev->dev);
+        int rc;
+
+        rc = ata_pci_device_do_resume(pdev);
+        if (rc)
+                return rc;
+        ninja32_program(host->iomap[0]);
+        ata_host_resume(host);
+        return 0;                       
+}
+#endif
+
 static const struct pci_device_id ninja32[] = {
         { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
@@ -156,7 +176,11 @@ static struct pci_driver ninja32_pci_driver = {
         .name           = DRV_NAME,
         .id_table       = ninja32,
         .probe          = ninja32_init_one,
-        .remove         = ata_pci_remove_one
+        .remove         = ata_pci_remove_one,
+#ifdef CONFIG_PM
+        .suspend        = ata_pci_device_suspend,
+        .resume         = ninja32_reinit_one,
+#endif
 };
 
 static int __init ninja32_init(void)
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index be756b7ef07e..40d411c460de 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -1,7 +1,6 @@
 /*
  * pata_ns87410.c       - National Semiconductor 87410 PATA for new ATA layer
  *                        (C) 2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index e0aa7eaaee0a..89bf5f865d6a 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -1,7 +1,7 @@
 /*
  *    pata_ns87415.c - NS87415 (non PARISC) PATA
  *
- *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2005 Red Hat <alan@lxorguk.ukuu.org.uk>
  *
  *    This is a fairly generic MWDMA controller. It has some limitations
  *    as it requires timing reloads on PIO/DMA transitions but it is otherwise
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index df64f2443001..c0dbc46a348e 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -1,7 +1,7 @@
 /*
  *    pata_oldpiix.c - Intel PATA/SATA controllers
  *
- *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2005 Red Hat
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index fb2cf661b0e8..e4fa4d565e96 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -1,7 +1,6 @@
 /*
  * pata_opti.c  - ATI PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Based on
  *  linux/drivers/ide/pci/opti621.c             Version 0.7     Sept 10, 2002
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 4cd744456313..93bb6e91973f 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -1,7 +1,6 @@
 /*
  * pata_optidma.c       - Opti DMA PATA for new ATA layer
  *                        (C) 2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  *      The Opti DMA controllers are related to the older PIO PCI controllers
  *      and indeed the VLB ones. The main differences are that the timing
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 02b596b9cf6a..271cb64d429e 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -1,6 +1,6 @@
 /*
  *   pata_pcmcia.c - PCMCIA PATA controller driver.
- *   Copyright 2005-2006 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005-2006 Red Hat Inc, all rights reserved.
  *   PCMCIA ident update Copyright 2006 Marcin Juszkiewicz
  *                                              <openembedded@hrw.one.pl>
  *
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index d2673060bc8d..799a6a098712 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -1,7 +1,7 @@
 /*
  * pata_pdc202xx_old.c  - Promise PDC202xx PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *                        (C) 2007 Bartlomiej Zolnierkiewicz
  *
  * Based in part on linux/drivers/ide/pci/pdc202xx_old.c
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 8f65ad61b8af..77e4e3b17f54 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -5,7 +5,7 @@
  *
  * Based on pata_pcmcia:
  *
- *   Copyright 2005-2006 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005-2006 Red Hat Inc, all rights reserved.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 63b7a1c165a5..3080f371222c 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -1,6 +1,6 @@
 /*
  *    pata_qdi.c - QDI VLB ATA controllers
- *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2006 Red Hat
  *
  * This driver mostly exists as a proof of concept for non PCI devices under
  * libata. While the QDI6580 was 'neat' in 1993 it is no longer terribly
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 1c0d9fa7ee54..0b0aa452de14 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -1,7 +1,7 @@
 /*
  *    pata_radisys.c - Intel PATA/SATA controllers
  *
- *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2006 Red Hat <alan@lxorguk.ukuu.org.uk>
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 0278fd2b8fb1..9a4bdca54616 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -1,5 +1,5 @@
 /*
- * New ATA layer SC1200 driver          Alan Cox <alan@redhat.com>
+ * New ATA layer SC1200 driver          Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * TODO: Mode selection filtering
  * TODO: Can't enable second channel until ATA core has serialize
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 16673d168573..cf3707e516a2 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -8,7 +8,7 @@
  *  Copyright 2003-2005 Jeff Garzik
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003 Red Hat Inc <alan@redhat.com>
+ *  Copyright (C) 2003 Red Hat Inc
  *
  * and drivers/ata/ahci.c:
  *  Copyright 2004-2005 Red Hat, Inc.
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index ffd26d0dc50d..72e41c9f969b 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -1,7 +1,6 @@
 /*
  * pata_serverworks.c   - Serverworks PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * based upon
  *
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index a598bb36aafc..83580a59db58 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -1,7 +1,6 @@
 /*
  * pata_sil680.c        - SIL680 PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * based upon
  *
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 26345d7b531c..d34236611752 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -1,7 +1,7 @@
 /*
  *    pata_sis.c - SiS ATA driver
  *
- *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2005 Red Hat
  *      (C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based upon linux/drivers/ide/pci/sis5513.c
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 69877bd81815..1b0e7b6d8ef5 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -1,7 +1,6 @@
 /*
  * pata_sl82c105.c      - SL82C105 PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Based in part on linux/drivers/ide/pci/sl82c105.c
  *              SL82C105/Winbond 553 IDE driver
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index b181261f2743..ef9597517cdd 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -1,7 +1,7 @@
 /*
  * pata_triflex.c       - Compaq PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * based upon
  *
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 8fdb2ce73210..681169c9c640 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -1,7 +1,6 @@
 /*
  * pata_via.c   - VIA PATA for new ATA layer
  *                        (C) 2005-2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  *  Documentation
  *      Most chipset documentation available under NDA only
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index a7606b044a61..319e164a3d74 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -1,6 +1,6 @@
 /*
  *    pata_winbond.c - Winbond VLB ATA controllers
- *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2006 Red Hat
  *
  *    Support for the Winbond 83759A when operating in advanced mode.
  *    Multichip mode is not currently supported.
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 4621807a1a6a..ccee930f1e12 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1329,6 +1329,11 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 }
         }
 
+        /* Set max read request size to 4096.  This slightly increases
+         * write throughput for pci-e variants.
+         */
+        pcie_set_readrq(pdev, 4096);
+
         sil24_init_controller(host);
 
         pci_set_master(pdev);
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 75dd6e22faff..c98c31ec2f75 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -355,7 +355,7 @@ static void __sysdev_resume(struct sys_device *dev)
  *      sysdev_suspend - Suspend all system devices.
  *      @state:         Power state to enter.
  *
- *      We perform an almost identical operation as sys_device_shutdown()
+ *      We perform an almost identical operation as sysdev_shutdown()
  *      above, though calling ->suspend() instead. Interrupts are disabled
  *      when this called. Devices are responsible for both saving state and
  *      quiescing or powering down the device.
@@ -437,7 +437,7 @@ aux_driver:
 /**
  *      sysdev_resume - Bring system devices back to life.
  *
- *      Similar to sys_device_suspend(), but we iterate the list forwards
+ *      Similar to sysdev_suspend(), but we iterate the list forwards
  *      to guarantee that parent devices are resumed before their children.
  *
  *      Note: Interrupts are disabled when called.
@@ -488,7 +488,8 @@ ssize_t sysdev_store_ulong(struct sys_device *sysdev,
         if (end == buf)
                 return -EINVAL;
         *(unsigned long *)(ea->var) = new;
-        return end - buf;
+        /* Always return full write size even if we didn't consume all */
+        return size;
 }
 EXPORT_SYMBOL_GPL(sysdev_store_ulong);
 
@@ -511,7 +512,8 @@ ssize_t sysdev_store_int(struct sys_device *sysdev,
         if (end == buf || new > INT_MAX || new < INT_MIN)
                 return -EINVAL;
         *(int *)(ea->var) = new;
-        return end - buf;
+        /* Always return full write size even if we didn't consume all */
+        return size;
 }
 EXPORT_SYMBOL_GPL(sysdev_store_int);
 
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 3f09cd8bcc38..5c4ee70d5cf3 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -40,8 +40,7 @@
  * Heinz Mauelshagen <mge@sistina.com>, Feb 2002
  *
  * Support for falling back on the write file operation when the address space
- * operations prepare_write and/or commit_write are not available on the
- * backing filesystem.
+ * operations write_begin is not available on the backing filesystem.
  * Anton Altaparmakov, 16 Feb 2005
  *
  * Still To Fix:
@@ -765,7 +764,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
                  */
                 if (!file->f_op->splice_read)
                         goto out_putf;
-                if (aops->prepare_write || aops->write_begin)
+                if (aops->write_begin)
                         lo_flags |= LO_FLAGS_USE_AOPS;
                 if (!(lo_flags & LO_FLAGS_USE_AOPS) && !file->f_op->write)
                         lo_flags |= LO_FLAGS_READ_ONLY;
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index e6ee21d99d92..b0e569ba730d 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -867,7 +867,7 @@ static int bluecard_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
         link->irq.Handler = bluecard_interrupt;
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 2cbe70b66470..b3e4d07a4ac2 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -343,6 +343,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
         bt3c_info_t *info = dev_inst;
         unsigned int iobase;
         int iir;
+        irqreturn_t r = IRQ_NONE;
 
         BUG_ON(!info->hdev);
 
@@ -374,11 +375,12 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
 
                         outb(iir, iobase + CONTROL);
                 }
+                r = IRQ_HANDLED;
         }
 
         spin_unlock(&(info->lock));
 
-        return IRQ_HANDLED;
+        return r;
 }
 
 
@@ -657,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
         link->irq.Handler = bt3c_interrupt;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 8e556b7ff9f6..efd689a062eb 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -293,6 +293,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
         unsigned int iobase;
         int boguscount = 0;
         int iir, lsr;
+        irqreturn_t r = IRQ_NONE;
 
         BUG_ON(!info->hdev);
 
@@ -302,6 +303,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
 
         iir = inb(iobase + UART_IIR) & UART_IIR_ID;
         while (iir) {
+                r = IRQ_HANDLED;
 
                 /* Clear interrupt */
                 lsr = inb(iobase + UART_LSR);
@@ -335,7 +337,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
 
         spin_unlock(&(info->lock));
 
-        return IRQ_HANDLED;
+        return r;
 }
 
 
@@ -586,7 +588,7 @@ static int btuart_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
         link->irq.Handler = btuart_interrupt;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index e6e6b037695a..901bdd95655f 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -297,6 +297,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
         unsigned char msr;
         int boguscount = 0;
         int iir, lsr;
+        irqreturn_t r = IRQ_NONE;
 
         BUG_ON(!info->hdev);
 
@@ -307,6 +308,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
         iir = inb(iobase + UART_IIR) & UART_IIR_ID;
         while (iir) {
 
+                r = IRQ_HANDLED;
                 /* Clear interrupt */
                 lsr = inb(iobase + UART_LSR);
 
@@ -343,11 +345,12 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
                 info->ri_latch = msr & UART_MSR_RI;
                 clear_bit(XMIT_WAITING, &(info->tx_state));
                 dtl1_write_wakeup(info);
+                r = IRQ_HANDLED;
         }
 
         spin_unlock(&(info->lock));
 
-        return IRQ_HANDLED;
+        return r;
 }
 
 
@@ -568,7 +571,7 @@ static int dtl1_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
         link->irq.Handler = dtl1_interrupt;
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 122254155ae1..43b35d0369d6 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -812,28 +812,6 @@ config JS_RTC
           To compile this driver as a module, choose M here: the
           module will be called js-rtc.
 
-config SGI_DS1286
-        tristate "SGI DS1286 RTC support"
-        depends on SGI_HAS_DS1286
-        help
-          If you say Y here and create a character special file /dev/rtc with
-          major number 10 and minor number 135 using mknod ("man mknod"), you
-          will get access to the real time clock built into your computer.
-          Every SGI has such a clock built in. It reports status information
-          via the file /proc/rtc and its behaviour is set by various ioctls on
-          /dev/rtc.
-
-config SGI_IP27_RTC
-        bool "SGI M48T35 RTC support"
-        depends on SGI_IP27
-        help
-          If you say Y here and create a character special file /dev/rtc with
-          major number 10 and minor number 135 using mknod ("man mknod"), you
-          will get access to the real time clock built into your computer.
-          Every SGI has such a clock built in. It reports status information
-          via the file /proc/rtc and its behaviour is set by various ioctls on
-          /dev/rtc.
-
 config GEN_RTC
         tristate "Generic /dev/rtc emulation"
         depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 1a4247dccac4..438f71317c5c 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -74,8 +74,6 @@ obj-$(CONFIG_RTC)		+= rtc.o
 obj-$(CONFIG_HPET)              += hpet.o
 obj-$(CONFIG_GEN_RTC)           += genrtc.o
 obj-$(CONFIG_EFI_RTC)           += efirtc.o
-obj-$(CONFIG_SGI_DS1286)        += ds1286.o
-obj-$(CONFIG_SGI_IP27_RTC)      += ip27-rtc.o
 obj-$(CONFIG_DS1302)            += ds1302.o
 obj-$(CONFIG_XILINX_HWICAP)     += xilinx_hwicap/
 ifeq ($(CONFIG_GENERIC_NVRAM),y)
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c
deleted file mode 100644
index 0a826d7be10e..000000000000
--- a/drivers/char/ds1286.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * DS1286 Real Time Clock interface for Linux
- *
- * Copyright (C) 1998, 1999, 2000 Ralf Baechle
- *
- * Based on code written by Paul Gortmaker.
- *
- * This driver allows use of the real time clock (built into nearly all
- * computers) from user space. It exports the /dev/rtc interface supporting
- * various ioctl() and also the /proc/rtc pseudo-file for status
- * information.
- *
- * The ioctls can be used to set the interrupt behaviour and generation rate
- * from the RTC via IRQ 8. Then the /dev/rtc interface can be used to make
- * use of these timer interrupts, be they interval or alarm based.
- *
- * The /dev/rtc interface will block on reads until an interrupt has been
- * received. If a RTC interrupt has already happened, it will output an
- * unsigned long and then block. The output value contains the interrupt
- * status in the low byte and the number of interrupts since the last read
- * in the remaining high bytes. The /dev/rtc interface can also be used with
- * the select(2) call.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-#include <linux/ds1286.h>
-#include <linux/smp_lock.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/slab.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/rtc.h>
-#include <linux/spinlock.h>
-#include <linux/bcd.h>
-#include <linux/proc_fs.h>
-#include <linux/jiffies.h>
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-#define DS1286_VERSION          "1.0"
-
-/*
- *      We sponge a minor off of the misc major. No need slurping
- *      up another valuable major dev number for this. If you add
- *      an ioctl, make sure you don't conflict with SPARC's RTC
- *      ioctls.
- */
-
-static DECLARE_WAIT_QUEUE_HEAD(ds1286_wait);
-
-static ssize_t ds1286_read(struct file *file, char *buf,
-                        size_t count, loff_t *ppos);
-
-static int ds1286_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg);
-
-static unsigned int ds1286_poll(struct file *file, poll_table *wait);
-
-static void ds1286_get_alm_time (struct rtc_time *alm_tm);
-static void ds1286_get_time(struct rtc_time *rtc_tm);
-static int ds1286_set_time(struct rtc_time *rtc_tm);
-
-static inline unsigned char ds1286_is_updating(void);
-
-static DEFINE_SPINLOCK(ds1286_lock);
-
-static int ds1286_read_proc(char *page, char **start, off_t off,
-                            int count, int *eof, void *data);
-
-/*
- *      Bits in rtc_status. (7 bits of room for future expansion)
- */
-
-#define RTC_IS_OPEN             0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON            0x02    /* missed irq timer active      */
-
-static unsigned char ds1286_status;     /* bitmapped status byte.       */
-
-static unsigned char days_in_mo[] = {
-        0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-/*
- *      Now all the various file operations that we export.
- */
-
-static ssize_t ds1286_read(struct file *file, char *buf,
-                           size_t count, loff_t *ppos)
-{
-        return -EIO;
-}
-
-static int ds1286_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct rtc_time wtime;
-
-        switch (cmd) {
-        case RTC_AIE_OFF:       /* Mask alarm int. enab. bit    */
-        {
-                unsigned long flags;
-                unsigned char val;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val |=  RTC_TDM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-
-                return 0;
-        }
-        case RTC_AIE_ON:        /* Allow alarm interrupts.      */
-        {
-                unsigned long flags;
-                unsigned char val;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val &=  ~RTC_TDM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-
-                return 0;
-        }
-        case RTC_WIE_OFF:       /* Mask watchdog int. enab. bit */
-        {
-                unsigned long flags;
-                unsigned char val;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val |= RTC_WAM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-
-                return 0;
-        }
-        case RTC_WIE_ON:        /* Allow watchdog interrupts.   */
-        {
-                unsigned long flags;
-                unsigned char val;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val &= ~RTC_WAM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-
-                return 0;
-        }
-        case RTC_ALM_READ:      /* Read the present alarm time */
-        {
-                /*
-                 * This returns a struct rtc_time. Reading >= 0xc0
-                 * means "don't care" or "match all". Only the tm_hour,
-                 * tm_min, and tm_sec values are filled in.
-                 */
-
-                memset(&wtime, 0, sizeof(wtime));
-                ds1286_get_alm_time(&wtime);
-                break;
-        }
-        case RTC_ALM_SET:       /* Store a time into the alarm */
-        {
-                /*
-                 * This expects a struct rtc_time. Writing 0xff means
-                 * "don't care" or "match all". Only the tm_hour,
-                 * tm_min and tm_sec are used.
-                 */
-                unsigned char hrs, min, sec;
-                struct rtc_time alm_tm;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                if (copy_from_user(&alm_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-
-                hrs = alm_tm.tm_hour;
-                min = alm_tm.tm_min;
-                sec = alm_tm.tm_sec;
-
-                if (hrs >= 24)
-                        hrs = 0xff;
-
-                if (min >= 60)
-                        min = 0xff;
-
-                if (sec != 0)
-                        return -EINVAL;
-
-                min = bin2bcd(min);
-                min = bin2bcd(hrs);
-
-                spin_lock(&ds1286_lock);
-                rtc_write(hrs, RTC_HOURS_ALARM);
-                rtc_write(min, RTC_MINUTES_ALARM);
-                spin_unlock(&ds1286_lock);
-
-                return 0;
-        }
-        case RTC_RD_TIME:       /* Read the time/date from RTC  */
-        {
-                memset(&wtime, 0, sizeof(wtime));
-                ds1286_get_time(&wtime);
-                break;
-        }
-        case RTC_SET_TIME:      /* Set the RTC */
-        {
-                struct rtc_time rtc_tm;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-
-                return ds1286_set_time(&rtc_tm);
-        }
-        default:
-                return -EINVAL;
-        }
-        return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0;
-}
-
-/*
- *      We enforce only one user at a time here with the open/close.
- *      Also clear the previous interrupt data on an open, and clean
- *      up things on a close.
- */
-
-static int ds1286_open(struct inode *inode, struct file *file)
-{
-        lock_kernel();
-        spin_lock_irq(&ds1286_lock);
-
-        if (ds1286_status & RTC_IS_OPEN)
-                goto out_busy;
-
-        ds1286_status |= RTC_IS_OPEN;
-
-        spin_unlock_irq(&ds1286_lock);
-        unlock_kernel();
-        return 0;
-
-out_busy:
-        spin_lock_irq(&ds1286_lock);
-        unlock_kernel();
-        return -EBUSY;
-}
-
-static int ds1286_release(struct inode *inode, struct file *file)
-{
-        ds1286_status &= ~RTC_IS_OPEN;
-
-        return 0;
-}
-
-static unsigned int ds1286_poll(struct file *file, poll_table *wait)
-{
-        poll_wait(file, &ds1286_wait, wait);
-
-        return 0;
-}
-
-/*
- *      The various file operations we support.
- */
-
-static const struct file_operations ds1286_fops = {
-        .llseek         = no_llseek,
-        .read           = ds1286_read,
-        .poll           = ds1286_poll,
-        .ioctl          = ds1286_ioctl,
-        .open           = ds1286_open,
-        .release        = ds1286_release,
-};
-
-static struct miscdevice ds1286_dev=
-{
-        .minor  = RTC_MINOR,
-        .name   = "rtc",
-        .fops   = &ds1286_fops,
-};
-
-static int __init ds1286_init(void)
-{
-        int err;
-
-        printk(KERN_INFO "DS1286 Real Time Clock Driver v%s\n", DS1286_VERSION);
-
-        err = misc_register(&ds1286_dev);
-        if (err)
-                goto out;
-
-        if (!create_proc_read_entry("driver/rtc", 0, 0, ds1286_read_proc, NULL)) {
-                err = -ENOMEM;
-
-                goto out_deregister;
-        }
-
-        return 0;
-
-out_deregister:
-        misc_deregister(&ds1286_dev);
-
-out:
-        return err;
-}
-
-static void __exit ds1286_exit(void)
-{
-        remove_proc_entry("driver/rtc", NULL);
-        misc_deregister(&ds1286_dev);
-}
-
-static char *days[] = {
-        "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-/*
- *      Info exported via "/proc/rtc".
- */
-static int ds1286_proc_output(char *buf)
-{
-        char *p, *s;
-        struct rtc_time tm;
-        unsigned char hundredth, month, cmd, amode;
-
-        p = buf;
-
-        ds1286_get_time(&tm);
-        hundredth = rtc_read(RTC_HUNDREDTH_SECOND);
-        hundredth = bcd2bin(hundredth);
-
-        p += sprintf(p,
-                     "rtc_time\t: %02d:%02d:%02d.%02d\n"
-                     "rtc_date\t: %04d-%02d-%02d\n",
-                     tm.tm_hour, tm.tm_min, tm.tm_sec, hundredth,
-                     tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
-
-        /*
-         * We implicitly assume 24hr mode here. Alarm values >= 0xc0 will
-         * match any value for that particular field. Values that are
-         * greater than a valid time, but less than 0xc0 shouldn't appear.
-         */
-        ds1286_get_alm_time(&tm);
-        p += sprintf(p, "alarm\t\t: %s ", days[tm.tm_wday]);
-        if (tm.tm_hour <= 24)
-                p += sprintf(p, "%02d:", tm.tm_hour);
-        else
-                p += sprintf(p, "**:");
-
-        if (tm.tm_min <= 59)
-                p += sprintf(p, "%02d\n", tm.tm_min);
-        else
-                p += sprintf(p, "**\n");
-
-        month = rtc_read(RTC_MONTH);
-        p += sprintf(p,
-                     "oscillator\t: %s\n"
-                     "square_wave\t: %s\n",
-                     (month & RTC_EOSC) ? "disabled" : "enabled",
-                     (month & RTC_ESQW) ? "disabled" : "enabled");
-
-        amode = ((rtc_read(RTC_MINUTES_ALARM) & 0x80) >> 5) |
-                ((rtc_read(RTC_HOURS_ALARM) & 0x80) >> 6) |
-                ((rtc_read(RTC_DAY_ALARM) & 0x80) >> 7);
-        if (amode == 7)      s = "each minute";
-        else if (amode == 3) s = "minutes match";
-        else if (amode == 1) s = "hours and minutes match";
-        else if (amode == 0) s = "days, hours and minutes match";
-        else                 s = "invalid";
-        p += sprintf(p, "alarm_mode\t: %s\n", s);
-
-        cmd = rtc_read(RTC_CMD);
-        p += sprintf(p,
-                     "alarm_enable\t: %s\n"
-                     "wdog_alarm\t: %s\n"
-                     "alarm_mask\t: %s\n"
-                     "wdog_alarm_mask\t: %s\n"
-                     "interrupt_mode\t: %s\n"
-                     "INTB_mode\t: %s_active\n"
-                     "interrupt_pins\t: %s\n",
-                     (cmd & RTC_TDF) ? "yes" : "no",
-                     (cmd & RTC_WAF) ? "yes" : "no",
-                     (cmd & RTC_TDM) ? "disabled" : "enabled",
-                     (cmd & RTC_WAM) ? "disabled" : "enabled",
-                     (cmd & RTC_PU_LVL) ? "pulse" : "level",
-                     (cmd & RTC_IBH_LO) ? "low" : "high",
-                     (cmd & RTC_IPSW) ? "unswapped" : "swapped");
-
-        return  p - buf;
-}
-
-static int ds1286_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data)
-{
-        int len = ds1286_proc_output (page);
-        if (len <= off+count) *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len>count)
-                len = count;
-        if (len<0)
-                len = 0;
-
-        return len;
-}
-
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char ds1286_is_updating(void)
-{
-        return rtc_read(RTC_CMD) & RTC_TE;
-}
-
-
-static void ds1286_get_time(struct rtc_time *rtc_tm)
-{
-        unsigned char save_control;
-        unsigned long flags;
-
-        /*
-         * read RTC once any update in progress is done. The update
-         * can take just over 2ms. We wait 10 to 20ms. There is no need to
-         * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
-         * If you need to know *exactly* when a second has started, enable
-         * periodic update complete interrupts, (via ioctl) and then
-         * immediately read /dev/rtc which will block until you get the IRQ.
-         * Once the read clears, read the RTC time (again via ioctl). Easy.
-         */
-
-        if (ds1286_is_updating() != 0)
-                msleep(20);
-
-        /*
-         * Only the values that we read from the RTC are set. We leave
-         * tm_wday, tm_yday and tm_isdst untouched. Even though the
-         * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
-         * by the RTC when initially set to a non-zero value.
-         */
-        spin_lock_irqsave(&ds1286_lock, flags);
-        save_control = rtc_read(RTC_CMD);
-        rtc_write((save_control|RTC_TE), RTC_CMD);
-
-        rtc_tm->tm_sec = rtc_read(RTC_SECONDS);
-        rtc_tm->tm_min = rtc_read(RTC_MINUTES);
-        rtc_tm->tm_hour = rtc_read(RTC_HOURS) & 0x3f;
-        rtc_tm->tm_mday = rtc_read(RTC_DATE);
-        rtc_tm->tm_mon = rtc_read(RTC_MONTH) & 0x1f;
-        rtc_tm->tm_year = rtc_read(RTC_YEAR);
-
-        rtc_write(save_control, RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-
-        rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);
-        rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);
-        rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
-        rtc_tm->tm_mday = bcd2bin(rtc_tm->tm_mday);
-        rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
-        rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
-
-        /*
-         * Account for differences between how the RTC uses the values
-         * and how they are defined in a struct rtc_time;
-         */
-        if (rtc_tm->tm_year < 45)
-                rtc_tm->tm_year += 30;
-        if ((rtc_tm->tm_year += 40) < 70)
-                rtc_tm->tm_year += 100;
-
-        rtc_tm->tm_mon--;
-}
-
-static int ds1286_set_time(struct rtc_time *rtc_tm)
-{
-        unsigned char mon, day, hrs, min, sec, leap_yr;
-        unsigned char save_control;
-        unsigned int yrs;
-        unsigned long flags;
-
-
-        yrs = rtc_tm->tm_year + 1900;
-        mon = rtc_tm->tm_mon + 1;   /* tm_mon starts at zero */
-        day = rtc_tm->tm_mday;
-        hrs = rtc_tm->tm_hour;
-        min = rtc_tm->tm_min;
-        sec = rtc_tm->tm_sec;
-
-        if (yrs < 1970)
-                return -EINVAL;
-
-        leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-
-        if ((mon > 12) || (day == 0))
-                return -EINVAL;
-
-        if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-                return -EINVAL;
-
-        if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-                return -EINVAL;
-
-        if ((yrs -= 1940) > 255)    /* They are unsigned */
-                return -EINVAL;
-
-        if (yrs >= 100)
-                yrs -= 100;
-
-        sec = bin2bcd(sec);
-        min = bin2bcd(min);
-        hrs = bin2bcd(hrs);
-        day = bin2bcd(day);
-        mon = bin2bcd(mon);
-        yrs = bin2bcd(yrs);
-
-        spin_lock_irqsave(&ds1286_lock, flags);
-        save_control = rtc_read(RTC_CMD);
-        rtc_write((save_control|RTC_TE), RTC_CMD);
-
-        rtc_write(yrs, RTC_YEAR);
-        rtc_write(mon, RTC_MONTH);
-        rtc_write(day, RTC_DATE);
-        rtc_write(hrs, RTC_HOURS);
-        rtc_write(min, RTC_MINUTES);
-        rtc_write(sec, RTC_SECONDS);
-        rtc_write(0, RTC_HUNDREDTH_SECOND);
-
-        rtc_write(save_control, RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-
-        return 0;
-}
-
-static void ds1286_get_alm_time(struct rtc_time *alm_tm)
-{
-        unsigned char cmd;
-        unsigned long flags;
-
-        /*
-         * Only the values that we read from the RTC are set. That
-         * means only tm_wday, tm_hour, tm_min.
-         */
-        spin_lock_irqsave(&ds1286_lock, flags);
-        alm_tm->tm_min = rtc_read(RTC_MINUTES_ALARM) & 0x7f;
-        alm_tm->tm_hour = rtc_read(RTC_HOURS_ALARM)  & 0x1f;
-        alm_tm->tm_wday = rtc_read(RTC_DAY_ALARM)    & 0x07;
-        cmd = rtc_read(RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-
-        alm_tm->tm_min = bcd2bin(alm_tm->tm_min);
-        alm_tm->tm_hour = bcd2bin(alm_tm->tm_hour);
-        alm_tm->tm_sec = 0;
-}
-
-module_init(ds1286_init);
-module_exit(ds1286_exit);
-
-MODULE_AUTHOR("Ralf Baechle");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(RTC_MINOR);
diff --git a/drivers/char/ip27-rtc.c b/drivers/char/ip27-rtc.c
deleted file mode 100644
index 2abd881b4cbc..000000000000
--- a/drivers/char/ip27-rtc.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- *      Driver for the SGS-Thomson M48T35 Timekeeper RAM chip
- *
- *      Real Time Clock interface for Linux
- *
- *      TODO: Implement periodic interrupts.
- *
- *      Copyright (C) 2000 Silicon Graphics, Inc.
- *      Written by Ulf Carlsson (ulfc@engr.sgi.com)
- *
- *      Based on code written by Paul Gortmaker.
- *
- *      This driver allows use of the real time clock (built into
- *      nearly all computers) from user space. It exports the /dev/rtc
- *      interface supporting various ioctl() and also the /proc/rtc
- *      pseudo-file for status information.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- */
-
-#define RTC_VERSION             "1.09b"
-
-#include <linux/bcd.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/smp_lock.h>
-#include <linux/types.h>
-#include <linux/miscdevice.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/rtc.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-
-#include <asm/m48t35.h>
-#include <asm/sn/ioc3.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/sn/klconfig.h>
-#include <asm/sn/sn0/ip27.h>
-#include <asm/sn/sn0/hub.h>
-#include <asm/sn/sn_private.h>
-
-static long rtc_ioctl(struct file *filp, unsigned int cmd,
-                        unsigned long arg);
-
-static int rtc_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data);
-
-static void get_rtc_time(struct rtc_time *rtc_tm);
-
-/*
- *      Bits in rtc_status. (6 bits of room for future expansion)
- */
-
-#define RTC_IS_OPEN             0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON            0x02    /* missed irq timer active      */
-
-static unsigned char rtc_status;        /* bitmapped status byte.       */
-static unsigned long rtc_freq;  /* Current periodic IRQ rate    */
-static struct m48t35_rtc *rtc;
-
-/*
- *      If this driver ever becomes modularised, it will be really nice
- *      to make the epoch retain its value across module reload...
- */
-
-static unsigned long epoch = 1970;      /* year corresponding to 0x00   */
-
-static const unsigned char days_in_mo[] =
-{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static long rtc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-{
-
-        struct rtc_time wtime;
-
-        switch (cmd) {
-        case RTC_RD_TIME:       /* Read the time/date from RTC  */
-        {
-                get_rtc_time(&wtime);
-                break;
-        }
-        case RTC_SET_TIME:      /* Set the RTC */
-        {
-                struct rtc_time rtc_tm;
-                unsigned char mon, day, hrs, min, sec, leap_yr;
-                unsigned int yrs;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-
-                yrs = rtc_tm.tm_year + 1900;
-                mon = rtc_tm.tm_mon + 1;   /* tm_mon starts at zero */
-                day = rtc_tm.tm_mday;
-                hrs = rtc_tm.tm_hour;
-                min = rtc_tm.tm_min;
-                sec = rtc_tm.tm_sec;
-
-                if (yrs < 1970)
-                        return -EINVAL;
-
-                leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-
-                if ((mon > 12) || (day == 0))
-                        return -EINVAL;
-
-                if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-                        return -EINVAL;
-
-                if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-                        return -EINVAL;
-
-                if ((yrs -= epoch) > 255)    /* They are unsigned */
-                        return -EINVAL;
-
-                if (yrs > 169)
-                        return -EINVAL;
-
-                if (yrs >= 100)
-                        yrs -= 100;
-
-                sec = bin2bcd(sec);
-                min = bin2bcd(min);
-                hrs = bin2bcd(hrs);
-                day = bin2bcd(day);
-                mon = bin2bcd(mon);
-                yrs = bin2bcd(yrs);
-
-                spin_lock_irq(&rtc_lock);
-                rtc->control |= M48T35_RTC_SET;
-                rtc->year = yrs;
-                rtc->month = mon;
-                rtc->date = day;
-                rtc->hour = hrs;
-                rtc->min = min;
-                rtc->sec = sec;
-                rtc->control &= ~M48T35_RTC_SET;
-                spin_unlock_irq(&rtc_lock);
-
-                return 0;
-        }
-        default:
-                return -EINVAL;
-        }
-        return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0;
-}
-
-/*
- *      We enforce only one user at a time here with the open/close.
- *      Also clear the previous interrupt data on an open, and clean
- *      up things on a close.
- */
-
-static int rtc_open(struct inode *inode, struct file *file)
-{
-        lock_kernel();
-        spin_lock_irq(&rtc_lock);
-
-        if (rtc_status & RTC_IS_OPEN) {
-                spin_unlock_irq(&rtc_lock);
-                unlock_kernel();
-                return -EBUSY;
-        }
-
-        rtc_status |= RTC_IS_OPEN;
-        spin_unlock_irq(&rtc_lock);
-        unlock_kernel();
-
-        return 0;
-}
-
-static int rtc_release(struct inode *inode, struct file *file)
-{
-        /*
-         * Turn off all interrupts once the device is no longer
-         * in use, and clear the data.
-         */
-
-        spin_lock_irq(&rtc_lock);
-        rtc_status &= ~RTC_IS_OPEN;
-        spin_unlock_irq(&rtc_lock);
-
-        return 0;
-}
-
-/*
- *      The various file operations we support.
- */
-
-static const struct file_operations rtc_fops = {
-        .owner          = THIS_MODULE,
-        .unlocked_ioctl = rtc_ioctl,
-        .open           = rtc_open,
-        .release        = rtc_release,
-};
-
-static struct miscdevice rtc_dev=
-{
-        RTC_MINOR,
-        "rtc",
-        &rtc_fops
-};
-
-static int __init rtc_init(void)
-{
-        rtc = (struct m48t35_rtc *)
-        (KL_CONFIG_CH_CONS_INFO(master_nasid)->memory_base + IOC3_BYTEBUS_DEV0);
-
-        printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION);
-        if (misc_register(&rtc_dev)) {
-                printk(KERN_ERR "rtc: cannot register misc device.\n");
-                return -ENODEV;
-        }
-        if (!create_proc_read_entry("driver/rtc", 0, NULL, rtc_read_proc, NULL)) {
-                printk(KERN_ERR "rtc: cannot create /proc/rtc.\n");
-                misc_deregister(&rtc_dev);
-                return -ENOENT;
-        }
-
-        rtc_freq = 1024;
-
-        return 0;
-}
-
-static void __exit rtc_exit (void)
-{
-        /* interrupts and timer disabled at this point by rtc_release */
-
-        remove_proc_entry ("rtc", NULL);
-        misc_deregister(&rtc_dev);
-}
-
-module_init(rtc_init);
-module_exit(rtc_exit);
-
-/*
- *      Info exported via "/proc/rtc".
- */
-
-static int rtc_get_status(char *buf)
-{
-        char *p;
-        struct rtc_time tm;
-
-        /*
-         * Just emulate the standard /proc/rtc
-         */
-
-        p = buf;
-
-        get_rtc_time(&tm);
-
-        /*
-         * There is no way to tell if the luser has the RTC set for local
-         * time or for Universal Standard Time (GMT). Probably local though.
-         */
-        p += sprintf(p,
-                     "rtc_time\t: %02d:%02d:%02d\n"
-                     "rtc_date\t: %04d-%02d-%02d\n"
-                     "rtc_epoch\t: %04lu\n"
-                     "24hr\t\t: yes\n",
-                     tm.tm_hour, tm.tm_min, tm.tm_sec,
-                     tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, epoch);
-
-        return  p - buf;
-}
-
-static int rtc_read_proc(char *page, char **start, off_t off,
-                                 int count, int *eof, void *data)
-{
-        int len = rtc_get_status(page);
-        if (len <= off+count) *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len>count) len = count;
-        if (len<0) len = 0;
-        return len;
-}
-
-static void get_rtc_time(struct rtc_time *rtc_tm)
-{
-        /*
-         * Do we need to wait for the last update to finish?
-         */
-
-        /*
-         * Only the values that we read from the RTC are set. We leave
-         * tm_wday, tm_yday and tm_isdst untouched. Even though the
-         * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
-         * by the RTC when initially set to a non-zero value.
-         */
-        spin_lock_irq(&rtc_lock);
-        rtc->control |= M48T35_RTC_READ;
-        rtc_tm->tm_sec = rtc->sec;
-        rtc_tm->tm_min = rtc->min;
-        rtc_tm->tm_hour = rtc->hour;
-        rtc_tm->tm_mday = rtc->date;
-        rtc_tm->tm_mon = rtc->month;
-        rtc_tm->tm_year = rtc->year;
-        rtc->control &= ~M48T35_RTC_READ;
-        spin_unlock_irq(&rtc_lock);
-
-        rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);
-        rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);
-        rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
-        rtc_tm->tm_mday = bcd2bin(rtc_tm->tm_mday);
-        rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
-        rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
-
-        /*
-         * Account for differences between how the RTC uses the values
-         * and how they are defined in a struct rtc_time;
-         */
-        if ((rtc_tm->tm_year += (epoch - 1900)) <= 69)
-                rtc_tm->tm_year += 100;
-
-        rtc_tm->tm_mon--;
-}
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 835a33c8d5f5..1d7b429f7ffa 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -957,3 +957,4 @@ module_exit(cleanup_ipmi);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
 MODULE_DESCRIPTION("Linux device interface for the IPMI message handler.");
+MODULE_ALIAS("platform:ipmi_si");
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 9a626e50b793..4d64a02612a4 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -554,7 +554,7 @@ static int mgslpc_probe(struct pcmcia_device *link)
     /* Initialize the struct pcmcia_device structure */
 
     /* Interrupt setup */
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->irq.IRQInfo1   = IRQ_LEVEL_ID;
     link->irq.Handler = NULL;
 
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 5a11e3cbcae2..e0dbd388757f 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -102,6 +102,13 @@ config EDAC_I3000
           Support for error detection and correction on the Intel
           3000 and 3010 server chipsets.
 
+config EDAC_X38
+        tristate "Intel X38"
+        depends on EDAC_MM_EDAC && PCI && X86
+        help
+          Support for error detection and correction on the Intel
+          X38 server chipsets.
+
 config EDAC_I82860
         tristate "Intel 82860"
         depends on EDAC_MM_EDAC && PCI && X86_32
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index e5e9104b5520..62c2d9bad8dc 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_EDAC_I82443BXGX)		+= i82443bxgx_edac.o
 obj-$(CONFIG_EDAC_I82875P)              += i82875p_edac.o
 obj-$(CONFIG_EDAC_I82975X)              += i82975x_edac.o
 obj-$(CONFIG_EDAC_I3000)                += i3000_edac.o
+obj-$(CONFIG_EDAC_X38)                  += x38_edac.o
 obj-$(CONFIG_EDAC_I82860)               += i82860_edac.o
 obj-$(CONFIG_EDAC_R82600)               += r82600_edac.o
 obj-$(CONFIG_EDAC_PASEMI)               += pasemi_edac.o
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index 887072f5dc8b..cd2e3b8087e7 100644
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -9,6 +9,7 @@
  */
 #undef DEBUG
 
+#include <linux/edac.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
@@ -164,6 +165,8 @@ static int __devinit cell_edac_probe(struct platform_device *pdev)
         if (regs == NULL)
                 return -ENODEV;
 
+        edac_op_state = EDAC_OPSTATE_POLL;
+
         /* Get channel population */
         reg = in_be64(&regs->mic_mnt_cfg);
         dev_dbg(&pdev->dev, "MIC_MNT_CFG = 0x%016lx\n", reg);
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
new file mode 100644
index 000000000000..2406c2ce2844
--- /dev/null
+++ b/drivers/edac/x38_edac.c
@@ -0,0 +1,524 @@
+/*
+ * Intel X38 Memory Controller kernel module
+ * Copyright (C) 2008 Cluster Computing, Inc.
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License.
+ *
+ * This file is based on i3200_edac.c
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/slab.h>
+#include <linux/edac.h>
+#include "edac_core.h"
+
+#define X38_REVISION            "1.1"
+
+#define EDAC_MOD_STR            "x38_edac"
+
+#define PCI_DEVICE_ID_INTEL_X38_HB      0x29e0
+
+#define X38_RANKS               8
+#define X38_RANKS_PER_CHANNEL   4
+#define X38_CHANNELS            2
+
+/* Intel X38 register addresses - device 0 function 0 - DRAM Controller */
+
+#define X38_MCHBAR_LOW  0x48    /* MCH Memory Mapped Register BAR */
+#define X38_MCHBAR_HIGH 0x4b
+#define X38_MCHBAR_MASK 0xfffffc000ULL  /* bits 35:14 */
+#define X38_MMR_WINDOW_SIZE     16384
+
+#define X38_TOM 0xa0    /* Top of Memory (16b)
+                                 *
+                                 * 15:10 reserved
+                                 *  9:0  total populated physical memory
+                                 */
+#define X38_TOM_MASK    0x3ff   /* bits 9:0 */
+#define X38_TOM_SHIFT 26        /* 64MiB grain */
+
+#define X38_ERRSTS      0xc8    /* Error Status Register (16b)
+                                 *
+                                 * 15    reserved
+                                 * 14    Isochronous TBWRR Run Behind FIFO Full
+                                 *       (ITCV)
+                                 * 13    Isochronous TBWRR Run Behind FIFO Put
+                                 *       (ITSTV)
+                                 * 12    reserved
+                                 * 11    MCH Thermal Sensor Event
+                                 *       for SMI/SCI/SERR (GTSE)
+                                 * 10    reserved
+                                 *  9    LOCK to non-DRAM Memory Flag (LCKF)
+                                 *  8    reserved
+                                 *  7    DRAM Throttle Flag (DTF)
+                                 *  6:2  reserved
+                                 *  1    Multi-bit DRAM ECC Error Flag (DMERR)
+                                 *  0    Single-bit DRAM ECC Error Flag (DSERR)
+                                 */
+#define X38_ERRSTS_UE           0x0002
+#define X38_ERRSTS_CE           0x0001
+#define X38_ERRSTS_BITS (X38_ERRSTS_UE | X38_ERRSTS_CE)
+
+
+/* Intel  MMIO register space - device 0 function 0 - MMR space */
+
+#define X38_C0DRB       0x200   /* Channel 0 DRAM Rank Boundary (16b x 4)
+                                 *
+                                 * 15:10 reserved
+                                 *  9:0  Channel 0 DRAM Rank Boundary Address
+                                 */
+#define X38_C1DRB       0x600   /* Channel 1 DRAM Rank Boundary (16b x 4) */
+#define X38_DRB_MASK    0x3ff   /* bits 9:0 */
+#define X38_DRB_SHIFT 26        /* 64MiB grain */
+
+#define X38_C0ECCERRLOG 0x280   /* Channel 0 ECC Error Log (64b)
+                                 *
+                                 * 63:48 Error Column Address (ERRCOL)
+                                 * 47:32 Error Row Address (ERRROW)
+                                 * 31:29 Error Bank Address (ERRBANK)
+                                 * 28:27 Error Rank Address (ERRRANK)
+                                 * 26:24 reserved
+                                 * 23:16 Error Syndrome (ERRSYND)
+                                 * 15: 2 reserved
+                                 *    1  Multiple Bit Error Status (MERRSTS)
+                                 *    0  Correctable Error Status (CERRSTS)
+                                 */
+#define X38_C1ECCERRLOG 0x680   /* Channel 1 ECC Error Log (64b) */
+#define X38_ECCERRLOG_CE        0x1
+#define X38_ECCERRLOG_UE        0x2
+#define X38_ECCERRLOG_RANK_BITS 0x18000000
+#define X38_ECCERRLOG_SYNDROME_BITS     0xff0000
+
+#define X38_CAPID0 0xe0 /* see P.94 of spec for details */
+
+static int x38_channel_num;
+
+static int how_many_channel(struct pci_dev *pdev)
+{
+        unsigned char capid0_8b; /* 8th byte of CAPID0 */
+
+        pci_read_config_byte(pdev, X38_CAPID0 + 8, &capid0_8b);
+        if (capid0_8b & 0x20) { /* check DCD: Dual Channel Disable */
+                debugf0("In single channel mode.\n");
+                x38_channel_num = 1;
+        } else {
+                debugf0("In dual channel mode.\n");
+                x38_channel_num = 2;
+        }
+
+        return x38_channel_num;
+}
+
+static unsigned long eccerrlog_syndrome(u64 log)
+{
+        return (log & X38_ECCERRLOG_SYNDROME_BITS) >> 16;
+}
+
+static int eccerrlog_row(int channel, u64 log)
+{
+        return ((log & X38_ECCERRLOG_RANK_BITS) >> 27) |
+                (channel * X38_RANKS_PER_CHANNEL);
+}
+
+enum x38_chips {
+        X38 = 0,
+};
+
+struct x38_dev_info {
+        const char *ctl_name;
+};
+
+struct x38_error_info {
+        u16 errsts;
+        u16 errsts2;
+        u64 eccerrlog[X38_CHANNELS];
+};
+
+static const struct x38_dev_info x38_devs[] = {
+        [X38] = {
+                .ctl_name = "x38"},
+};
+
+static struct pci_dev *mci_pdev;
+static int x38_registered = 1;
+
+
+static void x38_clear_error_info(struct mem_ctl_info *mci)
+{
+        struct pci_dev *pdev;
+
+        pdev = to_pci_dev(mci->dev);
+
+        /*
+         * Clear any error bits.
+         * (Yes, we really clear bits by writing 1 to them.)
+         */
+        pci_write_bits16(pdev, X38_ERRSTS, X38_ERRSTS_BITS,
+                         X38_ERRSTS_BITS);
+}
+
+static u64 x38_readq(const void __iomem *addr)
+{
+        return readl(addr) | (((u64)readl(addr + 4)) << 32);
+}
+
+static void x38_get_and_clear_error_info(struct mem_ctl_info *mci,
+                                 struct x38_error_info *info)
+{
+        struct pci_dev *pdev;
+        void __iomem *window = mci->pvt_info;
+
+        pdev = to_pci_dev(mci->dev);
+
+        /*
+         * This is a mess because there is no atomic way to read all the
+         * registers at once and the registers can transition from CE being
+         * overwritten by UE.
+         */
+        pci_read_config_word(pdev, X38_ERRSTS, &info->errsts);
+        if (!(info->errsts & X38_ERRSTS_BITS))
+                return;
+
+        info->eccerrlog[0] = x38_readq(window + X38_C0ECCERRLOG);
+        if (x38_channel_num == 2)
+                info->eccerrlog[1] = x38_readq(window + X38_C1ECCERRLOG);
+
+        pci_read_config_word(pdev, X38_ERRSTS, &info->errsts2);
+
+        /*
+         * If the error is the same for both reads then the first set
+         * of reads is valid.  If there is a change then there is a CE
+         * with no info and the second set of reads is valid and
+         * should be UE info.
+         */
+        if ((info->errsts ^ info->errsts2) & X38_ERRSTS_BITS) {
+                info->eccerrlog[0] = x38_readq(window + X38_C0ECCERRLOG);
+                if (x38_channel_num == 2)
+                        info->eccerrlog[1] =
+                                x38_readq(window + X38_C1ECCERRLOG);
+        }
+
+        x38_clear_error_info(mci);
+}
+
+static void x38_process_error_info(struct mem_ctl_info *mci,
+                                struct x38_error_info *info)
+{
+        int channel;
+        u64 log;
+
+        if (!(info->errsts & X38_ERRSTS_BITS))
+                return;
+
+        if ((info->errsts ^ info->errsts2) & X38_ERRSTS_BITS) {
+                edac_mc_handle_ce_no_info(mci, "UE overwrote CE");
+                info->errsts = info->errsts2;
+        }
+
+        for (channel = 0; channel < x38_channel_num; channel++) {
+                log = info->eccerrlog[channel];
+                if (log & X38_ECCERRLOG_UE) {
+                        edac_mc_handle_ue(mci, 0, 0,
+                                eccerrlog_row(channel, log), "x38 UE");
+                } else if (log & X38_ECCERRLOG_CE) {
+                        edac_mc_handle_ce(mci, 0, 0,
+                                eccerrlog_syndrome(log),
+                                eccerrlog_row(channel, log), 0, "x38 CE");
+                }
+        }
+}
+
+static void x38_check(struct mem_ctl_info *mci)
+{
+        struct x38_error_info info;
+
+        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
+        x38_get_and_clear_error_info(mci, &info);
+        x38_process_error_info(mci, &info);
+}
+
+
+void __iomem *x38_map_mchbar(struct pci_dev *pdev)
+{
+        union {
+                u64 mchbar;
+                struct {
+                        u32 mchbar_low;
+                        u32 mchbar_high;
+                };
+        } u;
+        void __iomem *window;
+
+        pci_read_config_dword(pdev, X38_MCHBAR_LOW, &u.mchbar_low);
+        pci_write_config_dword(pdev, X38_MCHBAR_LOW, u.mchbar_low | 0x1);
+        pci_read_config_dword(pdev, X38_MCHBAR_HIGH, &u.mchbar_high);
+        u.mchbar &= X38_MCHBAR_MASK;
+
+        if (u.mchbar != (resource_size_t)u.mchbar) {
+                printk(KERN_ERR
+                        "x38: mmio space beyond accessible range (0x%llx)\n",
+                        (unsigned long long)u.mchbar);
+                return NULL;
+        }
+
+        window = ioremap_nocache(u.mchbar, X38_MMR_WINDOW_SIZE);
+        if (!window)
+                printk(KERN_ERR "x38: cannot map mmio space at 0x%llx\n",
+                        (unsigned long long)u.mchbar);
+
+        return window;
+}
+
+
+static void x38_get_drbs(void __iomem *window,
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL])
+{
+        int i;
+
+        for (i = 0; i < X38_RANKS_PER_CHANNEL; i++) {
+                drbs[0][i] = readw(window + X38_C0DRB + 2*i) & X38_DRB_MASK;
+                drbs[1][i] = readw(window + X38_C1DRB + 2*i) & X38_DRB_MASK;
+        }
+}
+
+static bool x38_is_stacked(struct pci_dev *pdev,
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL])
+{
+        u16 tom;
+
+        pci_read_config_word(pdev, X38_TOM, &tom);
+        tom &= X38_TOM_MASK;
+
+        return drbs[X38_CHANNELS - 1][X38_RANKS_PER_CHANNEL - 1] == tom;
+}
+
+static unsigned long drb_to_nr_pages(
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL],
+                        bool stacked, int channel, int rank)
+{
+        int n;
+
+        n = drbs[channel][rank];
+        if (rank > 0)
+                n -= drbs[channel][rank - 1];
+        if (stacked && (channel == 1) && drbs[channel][rank] ==
+                                drbs[channel][X38_RANKS_PER_CHANNEL - 1]) {
+                n -= drbs[0][X38_RANKS_PER_CHANNEL - 1];
+        }
+
+        n <<= (X38_DRB_SHIFT - PAGE_SHIFT);
+        return n;
+}
+
+static int x38_probe1(struct pci_dev *pdev, int dev_idx)
+{
+        int rc;
+        int i;
+        struct mem_ctl_info *mci = NULL;
+        unsigned long last_page;
+        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL];
+        bool stacked;
+        void __iomem *window;
+
+        debugf0("MC: %s()\n", __func__);
+
+        window = x38_map_mchbar(pdev);
+        if (!window)
+                return -ENODEV;
+
+        x38_get_drbs(window, drbs);
+
+        how_many_channel(pdev);
+
+        /* FIXME: unconventional pvt_info usage */
+        mci = edac_mc_alloc(0, X38_RANKS, x38_channel_num, 0);
+        if (!mci)
+                return -ENOMEM;
+
+        debugf3("MC: %s(): init mci\n", __func__);
+
+        mci->dev = &pdev->dev;
+        mci->mtype_cap = MEM_FLAG_DDR2;
+
+        mci->edac_ctl_cap = EDAC_FLAG_SECDED;
+        mci->edac_cap = EDAC_FLAG_SECDED;
+
+        mci->mod_name = EDAC_MOD_STR;
+        mci->mod_ver = X38_REVISION;
+        mci->ctl_name = x38_devs[dev_idx].ctl_name;
+        mci->dev_name = pci_name(pdev);
+        mci->edac_check = x38_check;
+        mci->ctl_page_to_phys = NULL;
+        mci->pvt_info = window;
+
+        stacked = x38_is_stacked(pdev, drbs);
+
+        /*
+         * The dram rank boundary (DRB) reg values are boundary addresses
+         * for each DRAM rank with a granularity of 64MB.  DRB regs are
+         * cumulative; the last one will contain the total memory
+         * contained in all ranks.
+         */
+        last_page = -1UL;
+        for (i = 0; i < mci->nr_csrows; i++) {
+                unsigned long nr_pages;
+                struct csrow_info *csrow = &mci->csrows[i];
+
+                nr_pages = drb_to_nr_pages(drbs, stacked,
+                        i / X38_RANKS_PER_CHANNEL,
+                        i % X38_RANKS_PER_CHANNEL);
+
+                if (nr_pages == 0) {
+                        csrow->mtype = MEM_EMPTY;
+                        continue;
+                }
+
+                csrow->first_page = last_page + 1;
+                last_page += nr_pages;
+                csrow->last_page = last_page;
+                csrow->nr_pages = nr_pages;
+
+                csrow->grain = nr_pages << PAGE_SHIFT;
+                csrow->mtype = MEM_DDR2;
+                csrow->dtype = DEV_UNKNOWN;
+                csrow->edac_mode = EDAC_UNKNOWN;
+        }
+
+        x38_clear_error_info(mci);
+
+        rc = -ENODEV;
+        if (edac_mc_add_mc(mci)) {
+                debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__);
+                goto fail;
+        }
+
+        /* get this far and it's successful */
+        debugf3("MC: %s(): success\n", __func__);
+        return 0;
+
+fail:
+        iounmap(window);
+        if (mci)
+                edac_mc_free(mci);
+
+        return rc;
+}
+
+static int __devinit x38_init_one(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        int rc;
+
+        debugf0("MC: %s()\n", __func__);
+
+        if (pci_enable_device(pdev) < 0)
+                return -EIO;
+
+        rc = x38_probe1(pdev, ent->driver_data);
+        if (!mci_pdev)
+                mci_pdev = pci_dev_get(pdev);
+
+        return rc;
+}
+
+static void __devexit x38_remove_one(struct pci_dev *pdev)
+{
+        struct mem_ctl_info *mci;
+
+        debugf0("%s()\n", __func__);
+
+        mci = edac_mc_del_mc(&pdev->dev);
+        if (!mci)
+                return;
+
+        iounmap(mci->pvt_info);
+
+        edac_mc_free(mci);
+}
+
+static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
+        {
+         PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+         X38},
+        {
+         0,
+         }                      /* 0 terminated list. */
+};
+
+MODULE_DEVICE_TABLE(pci, x38_pci_tbl);
+
+static struct pci_driver x38_driver = {
+        .name = EDAC_MOD_STR,
+        .probe = x38_init_one,
+        .remove = __devexit_p(x38_remove_one),
+        .id_table = x38_pci_tbl,
+};
+
+static int __init x38_init(void)
+{
+        int pci_rc;
+
+        debugf3("MC: %s()\n", __func__);
+
+        /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+        opstate_init();
+
+        pci_rc = pci_register_driver(&x38_driver);
+        if (pci_rc < 0)
+                goto fail0;
+
+        if (!mci_pdev) {
+                x38_registered = 0;
+                mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                        PCI_DEVICE_ID_INTEL_X38_HB, NULL);
+                if (!mci_pdev) {
+                        debugf0("x38 pci_get_device fail\n");
+                        pci_rc = -ENODEV;
+                        goto fail1;
+                }
+
+                pci_rc = x38_init_one(mci_pdev, x38_pci_tbl);
+                if (pci_rc < 0) {
+                        debugf0("x38 init fail\n");
+                        pci_rc = -ENODEV;
+                        goto fail1;
+                }
+        }
+
+        return 0;
+
+fail1:
+        pci_unregister_driver(&x38_driver);
+
+fail0:
+        if (mci_pdev)
+                pci_dev_put(mci_pdev);
+
+        return pci_rc;
+}
+
+static void __exit x38_exit(void)
+{
+        debugf3("MC: %s()\n", __func__);
+
+        pci_unregister_driver(&x38_driver);
+        if (!x38_registered) {
+                x38_remove_one(mci_pdev);
+                pci_dev_put(mci_pdev);
+        }
+}
+
+module_init(x38_init);
+module_exit(x38_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Cluster Computing, Inc. Hitoshi Mitake");
+MODULE_DESCRIPTION("MC support for Intel X38 memory hub controllers");
+
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 743e6f8cb202..1903e7515650 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1263,6 +1263,7 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
         { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c
index 1a0d0dfc62fc..f5474300b83a 100644
--- a/drivers/hid/hid-dell.c
+++ b/drivers/hid/hid-dell.c
@@ -48,6 +48,7 @@ err_free:
 static const struct hid_device_id dell_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
         { }
 };
 MODULE_DEVICE_TABLE(hid, dell_devices);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index a0d6a6cb1842..5cc404291736 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -163,6 +163,9 @@
 
 #define USB_VENDOR_ID_GENERAL_TOUCH     0x0dfc
 
+#define USB_VENDOR_ID_GENERIC_13BA      0x13ba
+#define USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE    0x0017
+
 #define USB_VENDOR_ID_GLAB              0x06c2
 #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
 #define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 42bdd83444c1..18e5ddd722cd 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mm.h>
+#include <linux/mutex.h>
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <asm/unaligned.h>
@@ -776,21 +777,10 @@ static int usbhid_start(struct hid_device *hid)
         struct usb_interface *intf = to_usb_interface(hid->dev.parent);
         struct usb_host_interface *interface = intf->cur_altsetting;
         struct usb_device *dev = interface_to_usbdev(intf);
-        struct usbhid_device *usbhid;
+        struct usbhid_device *usbhid = hid->driver_data;
         unsigned int n, insize = 0;
         int ret;
 
-        WARN_ON(hid->driver_data);
-
-        usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL);
-        if (usbhid == NULL) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        hid->driver_data = usbhid;
-        usbhid->hid = hid;
-
         usbhid->bufsize = HID_MIN_BUFFER_SIZE;
         hid_find_max_report(hid, HID_INPUT_REPORT, &usbhid->bufsize);
         hid_find_max_report(hid, HID_OUTPUT_REPORT, &usbhid->bufsize);
@@ -804,6 +794,7 @@ static int usbhid_start(struct hid_device *hid)
         if (insize > HID_MAX_BUFFER_SIZE)
                 insize = HID_MAX_BUFFER_SIZE;
 
+        mutex_lock(&usbhid->setup);
         if (hid_alloc_buffers(dev, hid)) {
                 ret = -ENOMEM;
                 goto fail;
@@ -888,6 +879,9 @@ static int usbhid_start(struct hid_device *hid)
         usbhid_init_reports(hid);
         hid_dump_device(hid);
 
+        set_bit(HID_STARTED, &usbhid->iofl);
+        mutex_unlock(&usbhid->setup);
+
         return 0;
 
 fail:
@@ -895,8 +889,7 @@ fail:
         usb_free_urb(usbhid->urbout);
         usb_free_urb(usbhid->urbctrl);
         hid_free_buffers(dev, hid);
-        kfree(usbhid);
-err:
+        mutex_unlock(&usbhid->setup);
         return ret;
 }
 
@@ -907,6 +900,8 @@ static void usbhid_stop(struct hid_device *hid)
         if (WARN_ON(!usbhid))
                 return;
 
+        mutex_lock(&usbhid->setup);
+        clear_bit(HID_STARTED, &usbhid->iofl);
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
         set_bit(HID_DISCONNECTED, &usbhid->iofl);
         spin_unlock_irq(&usbhid->inlock);
@@ -931,8 +926,7 @@ static void usbhid_stop(struct hid_device *hid)
         usb_free_urb(usbhid->urbout);
 
         hid_free_buffers(hid_to_usb_dev(hid), hid);
-        kfree(usbhid);
-        hid->driver_data = NULL;
+        mutex_unlock(&usbhid->setup);
 }
 
 static struct hid_ll_driver usb_hid_driver = {
@@ -947,6 +941,7 @@ static struct hid_ll_driver usb_hid_driver = {
 static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
+        struct usbhid_device *usbhid;
         struct hid_device *hid;
         size_t len;
         int ret;
@@ -1000,14 +995,26 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         if (usb_string(dev, dev->descriptor.iSerialNumber, hid->uniq, 64) <= 0)
                 hid->uniq[0] = 0;
 
+        usbhid = kzalloc(sizeof(*usbhid), GFP_KERNEL);
+        if (usbhid == NULL) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        hid->driver_data = usbhid;
+        usbhid->hid = hid;
+        mutex_init(&usbhid->setup); /* needed on suspend/resume */
+
         ret = hid_add_device(hid);
         if (ret) {
                 if (ret != -ENODEV)
                         dev_err(&intf->dev, "can't add hid device: %d\n", ret);
-                goto err;
+                goto err_free;
         }
 
         return 0;
+err_free:
+        kfree(usbhid);
 err:
         hid_destroy_device(hid);
         return ret;
@@ -1016,11 +1023,14 @@ err:
 static void hid_disconnect(struct usb_interface *intf)
 {
         struct hid_device *hid = usb_get_intfdata(intf);
+        struct usbhid_device *usbhid;
 
         if (WARN_ON(!hid))
                 return;
 
+        usbhid = hid->driver_data;
         hid_destroy_device(hid);
+        kfree(usbhid);
 }
 
 static int hid_suspend(struct usb_interface *intf, pm_message_t message)
@@ -1028,11 +1038,18 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
         struct hid_device *hid = usb_get_intfdata (intf);
         struct usbhid_device *usbhid = hid->driver_data;
 
+        mutex_lock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
+                mutex_unlock(&usbhid->setup);
+                return 0;
+        }
+
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
         set_bit(HID_SUSPENDED, &usbhid->iofl);
         spin_unlock_irq(&usbhid->inlock);
-        del_timer(&usbhid->io_retry);
+        del_timer_sync(&usbhid->io_retry);
         usb_kill_urb(usbhid->urbin);
+        mutex_unlock(&usbhid->setup);
         dev_dbg(&intf->dev, "suspend\n");
         return 0;
 }
@@ -1043,9 +1060,16 @@ static int hid_resume(struct usb_interface *intf)
         struct usbhid_device *usbhid = hid->driver_data;
         int status;
 
+        mutex_lock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
+                mutex_unlock(&usbhid->setup);
+                return 0;
+        }
+
         clear_bit(HID_SUSPENDED, &usbhid->iofl);
         usbhid->retry_delay = 0;
         status = hid_start_in(hid);
+        mutex_unlock(&usbhid->setup);
         dev_dbg(&intf->dev, "resume status %d\n", status);
         return status;
 }
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index abedb13c623e..55973ff54008 100644
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
@@ -73,6 +74,7 @@ struct usbhid_device {
         dma_addr_t outbuf_dma;                                          /* Output buffer dma */
         spinlock_t outlock;                                             /* Output fifo spinlock */
 
+        struct mutex setup;
         unsigned long iofl;                                             /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */
         struct timer_list io_retry;                                     /* Retry timer */
         unsigned long stop_retry;                                       /* Time to give up, in jiffies */
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index c772e02c2803..1fac4e233133 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -507,7 +507,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
         unsigned long timeout;
         int ret;
 
-        if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)
+        if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
                 return -EIO;
 
         ret = s3c24xx_i2c_set_master(i2c);
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index c3022a023449..e4c98539c517 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -81,6 +81,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = {
 
 static struct i2c_adapter scx200_i2c_ops = {
         .owner             = THIS_MODULE,
+        .class             = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .id                = I2C_HW_B_SCX200,
         .algo_data         = &scx200_i2c_data,
         .name   = "NatSemi SCx200 I2C",
diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c
index ce238f59b3c8..be3a15f5b25d 100644
--- a/drivers/input/misc/sgi_btns.c
+++ b/drivers/input/misc/sgi_btns.c
@@ -174,5 +174,6 @@ static void __exit sgi_buttons_exit(void)
         platform_driver_unregister(&sgi_buttons_driver);
 }
 
+MODULE_LICENSE("GPL");
 module_init(sgi_buttons_init);
 module_exit(sgi_buttons_exit);
diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index 2768c69257f6..1f3cc512eff8 100644
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -58,7 +58,7 @@ static void da903x_led_work(struct work_struct *work)
                 offset = DA9030_LED_OFFSET(led->id);
                 val = led->flags & ~0x87;
                 val |= (led->new_brightness) ? 0x80 : 0; /* EN bit */
-                val |= (led->new_brightness >> 5) & 0x7; /* PWM<2:0> */
+                val |= (0x7 - (led->new_brightness >> 5)) & 0x7; /* PWM<2:0> */
                 da903x_write(led->master, DA9030_LED1_CONTROL + offset, val);
                 break;
         case DA9030_ID_VIBRA:
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 92dcc06832a4..9d7b53ed75b2 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -656,9 +656,10 @@ static void do_failures(struct mirror_set *ms, struct bio_list *failures)
                 return;
 
         if (!ms->log_failure) {
-                while ((bio = bio_list_pop(failures)))
+                while ((bio = bio_list_pop(failures))) {
                         ms->in_sync = 0;
                         dm_rh_mark_nosync(ms->rh, bio, bio->bi_size, 0);
+                }
                 return;
         }
 
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index b2d9d1ac28ad..6c96db26b87c 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -229,19 +229,21 @@ static void __insert_origin(struct origin *o)
  */
 static int register_snapshot(struct dm_snapshot *snap)
 {
-        struct origin *o;
+        struct origin *o, *new_o;
         struct block_device *bdev = snap->origin->bdev;
 
+        new_o = kmalloc(sizeof(*new_o), GFP_KERNEL);
+        if (!new_o)
+                return -ENOMEM;
+
         down_write(&_origins_lock);
         o = __lookup_origin(bdev);
 
-        if (!o) {
+        if (o)
+                kfree(new_o);
+        else {
                 /* New origin */
-                o = kmalloc(sizeof(*o), GFP_KERNEL);
-                if (!o) {
-                        up_write(&_origins_lock);
-                        return -ENOMEM;
-                }
+                o = new_o;
 
                 /* Initialise the struct */
                 INIT_LIST_HEAD(&o->snapshots);
@@ -368,6 +370,7 @@ static struct dm_snap_pending_exception *alloc_pending_exception(struct dm_snaps
         struct dm_snap_pending_exception *pe = mempool_alloc(s->pending_pool,
                                                              GFP_NOIO);
 
+        atomic_inc(&s->pending_exceptions_count);
         pe->snap = s;
 
         return pe;
@@ -375,7 +378,11 @@ static struct dm_snap_pending_exception *alloc_pending_exception(struct dm_snaps
 
 static void free_pending_exception(struct dm_snap_pending_exception *pe)
 {
-        mempool_free(pe, pe->snap->pending_pool);
+        struct dm_snapshot *s = pe->snap;
+
+        mempool_free(pe, s->pending_pool);
+        smp_mb__before_atomic_dec();
+        atomic_dec(&s->pending_exceptions_count);
 }
 
 static void insert_completed_exception(struct dm_snapshot *s,
@@ -600,6 +607,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         s->valid = 1;
         s->active = 0;
+        atomic_set(&s->pending_exceptions_count, 0);
         init_rwsem(&s->lock);
         spin_lock_init(&s->pe_lock);
         s->ti = ti;
@@ -726,6 +734,14 @@ static void snapshot_dtr(struct dm_target *ti)
         /* After this returns there can be no new kcopyd jobs. */
         unregister_snapshot(s);
 
+        while (atomic_read(&s->pending_exceptions_count))
+                yield();
+        /*
+         * Ensure instructions in mempool_destroy aren't reordered
+         * before atomic_read.
+         */
+        smp_mb();
+
 #ifdef CONFIG_DM_DEBUG
         for (i = 0; i < DM_TRACKED_CHUNK_HASH_SIZE; i++)
                 BUG_ON(!hlist_empty(&s->tracked_chunk_hash[i]));
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index f07315fe2362..99c0106ede2d 100644
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -160,6 +160,8 @@ struct dm_snapshot {
 
         mempool_t *pending_pool;
 
+        atomic_t pending_exceptions_count;
+
         struct exception_table pending;
         struct exception_table complete;
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index b4162f6f1b79..9abf6ed16535 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3884,6 +3884,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
         if (mode == 0) {
                 mdk_rdev_t *rdev;
                 struct list_head *tmp;
+                struct block_device *bdev;
 
                 printk(KERN_INFO "md: %s stopped.\n", mdname(mddev));
 
@@ -3940,6 +3941,12 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                 mddev->degraded = 0;
                 mddev->barriers_work = 0;
                 mddev->safemode = 0;
+                bdev = bdget_disk(mddev->gendisk, 0);
+                if (bdev) {
+                        blkdev_ioctl(bdev, 0, BLKRRPART, 0);
+                        bdput(bdev);
+                }
+                kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);
 
         } else if (mddev->pers)
                 printk(KERN_INFO "md: %s switched to read-only mode.\n",
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 11a617ab4243..84bdc2ee69e6 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -567,8 +567,8 @@ static void i2o_block_biosparam(unsigned long capacity, unsigned short *cyls,
 
 /**
  *      i2o_block_open - Open the block device
- *      @inode: inode for block device being opened
- *      @file: file to open
+ *      @bdev: block device being opened
+ *      @mode: file open mode
  *
  *      Power up the device, mount and lock the media. This function is called,
  *      if the block device is opened for access.
@@ -596,8 +596,8 @@ static int i2o_block_open(struct block_device *bdev, fmode_t mode)
 
 /**
  *      i2o_block_release - Release the I2O block device
- *      @inode: inode for block device being released
- *      @file: file to close
+ *      @disk: gendisk device being released
+ *      @mode: file open mode
  *
  *      Unlock and unmount the media, and power down the device. Gets called if
  *      the block device is closed.
@@ -643,8 +643,8 @@ static int i2o_block_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 
 /**
  *      i2o_block_ioctl - Issue device specific ioctl calls.
- *      @inode: inode for block device ioctl
- *      @file: file for ioctl
+ *      @bdev: block device being opened
+ *      @mode: file open mode
  *      @cmd: ioctl command
  *      @arg: arg
  *
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 08e26beefe64..ce39fa54949b 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -113,7 +113,6 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
         if (!hdpu_chassis_id)
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_chassis_id\n");
-        }
 
         return 0;
 }
diff --git a/drivers/misc/sgi-xp/Makefile b/drivers/misc/sgi-xp/Makefile
index 35ce28578075..4fc40d8e1bcc 100644
--- a/drivers/misc/sgi-xp/Makefile
+++ b/drivers/misc/sgi-xp/Makefile
@@ -5,14 +5,14 @@
 obj-$(CONFIG_SGI_XP)            += xp.o
 xp-y                            := xp_main.o
 xp-$(CONFIG_IA64_SGI_SN2)       += xp_sn2.o xp_nofault.o
-xp-$(CONFIG_IA64_GENERIC)       += xp_sn2.o xp_nofault.o xp_uv.o
+xp-$(CONFIG_IA64_GENERIC)       += xp_sn2.o xp_nofault.o
 xp-$(CONFIG_IA64_SGI_UV)        += xp_uv.o
 xp-$(CONFIG_X86_64)             += xp_uv.o
 
 obj-$(CONFIG_SGI_XP)            += xpc.o
 xpc-y                           := xpc_main.o xpc_channel.o xpc_partition.o
 xpc-$(CONFIG_IA64_SGI_SN2)      += xpc_sn2.o
-xpc-$(CONFIG_IA64_GENERIC)      += xpc_sn2.o xpc_uv.o
+xpc-$(CONFIG_IA64_GENERIC)      += xpc_sn2.o
 xpc-$(CONFIG_IA64_SGI_UV)       += xpc_uv.o
 xpc-$(CONFIG_X86_64)            += xpc_uv.o
 
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 859a5281c61b..ed1722e50049 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -19,7 +19,11 @@
 #include <asm/system.h>
 #include <asm/sn/arch.h>        /* defines is_shub1() and is_shub2() */
 #define is_shub()       ia64_platform_is("sn2")
+#ifdef CONFIG_IA64_SGI_UV
 #define is_uv()         ia64_platform_is("uv")
+#else
+#define is_uv()         0
+#endif
 #endif
 #ifdef CONFIG_X86_64
 #include <asm/genapic.h>
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index 46325fc84811..e8d5cfbd32c2 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -1104,7 +1104,7 @@ xpc_do_exit(enum xp_retval reason)
 
         if (is_shub())
                 xpc_exit_sn2();
-        else
+        else if (is_uv())
                 xpc_exit_uv();
 }
 
@@ -1363,7 +1363,7 @@ out_2:
 out_1:
         if (is_shub())
                 xpc_exit_sn2();
-        else
+        else if (is_uv())
                 xpc_exit_uv();
         return ret;
 }
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 5a97d3a9d745..f483c4221f76 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -2315,8 +2315,10 @@ end:
  */
 static int sony_pic_disable(struct acpi_device *device)
 {
-        if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
-                        "_DIS", NULL, NULL)))
+        acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
+                                               NULL);
+
+        if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
                 return -ENXIO;
 
         dprintk("Device disabled\n");
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 696cf3647ceb..2fadf323c696 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -391,6 +391,7 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
 static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 {
         struct mmci_host *host = mmc_priv(mmc);
+        unsigned long flags;
 
         WARN_ON(host->mrq != NULL);
 
@@ -402,7 +403,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
                 return;
         }
 
-        spin_lock_irq(&host->lock);
+        spin_lock_irqsave(&host->lock, flags);
 
         host->mrq = mrq;
 
@@ -411,7 +412,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
         mmci_start_command(host, mrq->cmd, 0);
 
-        spin_unlock_irq(&host->lock);
+        spin_unlock_irqrestore(&host->lock, flags);
 }
 
 static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 20fcf0cdd801..4a2ef838fed6 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -644,10 +644,6 @@ This function frees the  transmiter and receiver descriptor rings.
 */
 static void amd8111e_free_ring(struct amd8111e_priv* lp)
 {
-
-        /* Free transmit and receive skbs */
-        amd8111e_free_skbs(lp->amd8111e_net_dev);
-
         /* Free transmit and receive descriptor rings */
         if(lp->rx_ring){
                 pci_free_consistent(lp->pci_dev,
@@ -833,12 +829,14 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
 
         } while(intr0 & RINT0);
 
-        /* Receive descriptor is empty now */
-        spin_lock_irqsave(&lp->lock, flags);
-        __netif_rx_complete(dev, napi);
-        writel(VAL0|RINTEN0, mmio + INTEN0);
-        writel(VAL2 | RDMD0, mmio + CMD0);
-        spin_unlock_irqrestore(&lp->lock, flags);
+        if (rx_pkt_limit > 0) {
+                /* Receive descriptor is empty now */
+                spin_lock_irqsave(&lp->lock, flags);
+                __netif_rx_complete(dev, napi);
+                writel(VAL0|RINTEN0, mmio + INTEN0);
+                writel(VAL2 | RDMD0, mmio + CMD0);
+                spin_unlock_irqrestore(&lp->lock, flags);
+        }
 
 rx_not_empty:
         return num_rx_pkt;
@@ -1231,7 +1229,9 @@ static int amd8111e_close(struct net_device * dev)
 
         amd8111e_disable_interrupt(lp);
         amd8111e_stop_chip(lp);
-        amd8111e_free_ring(lp);
+
+        /* Free transmit and receive skbs */
+        amd8111e_free_skbs(lp->amd8111e_net_dev);
 
         netif_carrier_off(lp->amd8111e_net_dev);
 
@@ -1241,6 +1241,7 @@ static int amd8111e_close(struct net_device * dev)
 
         spin_unlock_irq(&lp->lock);
         free_irq(dev->irq, dev);
+        amd8111e_free_ring(lp);
 
         /* Update the statistics before closing */
         amd8111e_get_stats(dev);
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 65ce451ae961..e21dc2075ed8 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -1078,7 +1078,8 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
                 init_timer(&lp->check_timer);
                 lp->check_timer.data = (unsigned long)dev;
                 lp->check_timer.function = at91ether_check_link;
-        }
+        } else if (lp->board_data.phy_irq_pin >= 32)
+                gpio_request(lp->board_data.phy_irq_pin, "ethernet_phy");
 
         /* Display ethernet banner */
         printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%pM)\n",
@@ -1165,6 +1166,9 @@ static int __devexit at91ether_remove(struct platform_device *pdev)
         struct net_device *dev = platform_get_drvdata(pdev);
         struct at91_private *lp = netdev_priv(dev);
 
+        if (lp->board_data.phy_irq_pin >= 32)
+                gpio_free(lp->board_data.phy_irq_pin);
+
         unregister_netdev(dev);
         free_irq(dev->irq, dev);
         dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 3cf59a7f5a1c..246d92b42636 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2310,7 +2310,8 @@ static void atl1_tx_queue(struct atl1_adapter *adapter, u16 count,
                 if (tpd != ptpd)
                         memcpy(tpd, ptpd, sizeof(struct tx_packet_desc));
                 tpd->buffer_addr = cpu_to_le64(buffer_info->dma);
-                tpd->word2 = (cpu_to_le16(buffer_info->length) &
+                tpd->word2 &= ~(TPD_BUFLEN_MASK << TPD_BUFLEN_SHIFT);
+                tpd->word2 |= (cpu_to_le16(buffer_info->length) &
                         TPD_BUFLEN_MASK) << TPD_BUFLEN_SHIFT;
 
                 /*
@@ -2409,8 +2410,8 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 vlan_tag = (vlan_tag << 4) | (vlan_tag >> 13) |
                         ((vlan_tag >> 9) & 0x8);
                 ptpd->word3 |= 1 << TPD_INS_VL_TAG_SHIFT;
-                ptpd->word3 |= (vlan_tag & TPD_VL_TAGGED_MASK) <<
-                        TPD_VL_TAGGED_SHIFT;
+                ptpd->word2 |= (vlan_tag & TPD_VLANTAG_MASK) <<
+                        TPD_VLANTAG_SHIFT;
         }
 
         tso = atl1_tso(adapter, skb, ptpd);
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index a5015b14a429..ffa73fc8d95e 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -504,7 +504,7 @@ struct rx_free_desc {
 #define TPD_PKTNT_MASK          0x0001
 #define TPD_PKTINT_SHIFT        15
 #define TPD_VLANTAG_MASK        0xFFFF
-#define TPD_VLAN_SHIFT          16
+#define TPD_VLANTAG_SHIFT       16
 
 /* tpd word 3 bits 0:13 */
 #define TPD_EOP_MASK            0x0001
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index ade5f3f6693b..87437c788476 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -169,11 +169,14 @@ static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_
         /* clear slave from tx_hashtbl */
         tx_hash_table = BOND_ALB_INFO(bond).tx_hashtbl;
 
-        index = SLAVE_TLB_INFO(slave).head;
-        while (index != TLB_NULL_INDEX) {
-                u32 next_index = tx_hash_table[index].next;
-                tlb_init_table_entry(&tx_hash_table[index], save_load);
-                index = next_index;
+        /* skip this if we've already freed the tx hash table */
+        if (tx_hash_table) {
+                index = SLAVE_TLB_INFO(slave).head;
+                while (index != TLB_NULL_INDEX) {
+                        u32 next_index = tx_hash_table[index].next;
+                        tlb_init_table_entry(&tx_hash_table[index], save_load);
+                        index = next_index;
+                }
         }
 
         tlb_init_slave(slave);
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f2da031fd7ba..fd9028d7c06e 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1978,6 +1978,20 @@ void bond_destroy(struct bonding *bond)
         unregister_netdevice(bond->dev);
 }
 
+static void bond_destructor(struct net_device *bond_dev)
+{
+        struct bonding *bond = bond_dev->priv;
+
+        if (bond->wq)
+                destroy_workqueue(bond->wq);
+
+        netif_addr_lock_bh(bond_dev);
+        bond_mc_list_destroy(bond);
+        netif_addr_unlock_bh(bond_dev);
+
+        free_netdev(bond_dev);
+}
+
 /*
 * First release a slave and than destroy the bond if no more slaves iare left.
 * Must be under rtnl_lock when this function is called.
@@ -2375,6 +2389,9 @@ static void bond_miimon_commit(struct bonding *bond)
                         continue;
 
                 case BOND_LINK_DOWN:
+                        if (slave->link_failure_count < UINT_MAX)
+                                slave->link_failure_count++;
+
                         slave->link = BOND_LINK_DOWN;
 
                         if (bond->params.mode == BOND_MODE_ACTIVEBACKUP ||
@@ -4543,7 +4560,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
 
         bond_set_mode_ops(bond, bond->params.mode);
 
-        bond_dev->destructor = free_netdev;
+        bond_dev->destructor = bond_destructor;
 
         /* Initialize the device options */
         bond_dev->tx_queue_len = 0;
@@ -4582,20 +4599,6 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
         return 0;
 }
 
-/* De-initialize device specific data.
- * Caller must hold rtnl_lock.
- */
-static void bond_deinit(struct net_device *bond_dev)
-{
-        struct bonding *bond = bond_dev->priv;
-
-        list_del(&bond->bond_list);
-
-#ifdef CONFIG_PROC_FS
-        bond_remove_proc_entry(bond);
-#endif
-}
-
 static void bond_work_cancel_all(struct bonding *bond)
 {
         write_lock_bh(&bond->lock);
@@ -4617,6 +4620,22 @@ static void bond_work_cancel_all(struct bonding *bond)
                 cancel_delayed_work(&bond->ad_work);
 }
 
+/* De-initialize device specific data.
+ * Caller must hold rtnl_lock.
+ */
+static void bond_deinit(struct net_device *bond_dev)
+{
+        struct bonding *bond = bond_dev->priv;
+
+        list_del(&bond->bond_list);
+
+        bond_work_cancel_all(bond);
+
+#ifdef CONFIG_PROC_FS
+        bond_remove_proc_entry(bond);
+#endif
+}
+
 /* Unregister and free all bond devices.
  * Caller must hold rtnl_lock.
  */
@@ -4628,9 +4647,6 @@ static void bond_free_all(void)
                 struct net_device *bond_dev = bond->dev;
 
                 bond_work_cancel_all(bond);
-                netif_addr_lock_bh(bond_dev);
-                bond_mc_list_destroy(bond);
-                netif_addr_unlock_bh(bond_dev);
                 /* Release the bonded slaves */
                 bond_release_all(bond_dev);
                 bond_destroy(bond);
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 82dd1a891ce7..002d918fb4c7 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0094"
+#define DRV_VERSION     "EHEA_0095"
 
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index 9b61dc9865d1..9d006878f045 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -632,10 +632,13 @@ static void ehea_rebuild_busmap(void)
         }
 }
 
-static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)
+static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add)
 {
         unsigned long i, start_section, end_section;
 
+        if (!nr_pages)
+                return 0;
+
         if (!ehea_bmap) {
                 ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);
                 if (!ehea_bmap)
@@ -643,7 +646,7 @@ static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)
         }
 
         start_section = (pfn * PAGE_SIZE) / EHEA_SECTSIZE;
-        end_section = start_section + ((pgnum * PAGE_SIZE) / EHEA_SECTSIZE);
+        end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);
         /* Mark entries as valid or invalid only; address is assigned later */
         for (i = start_section; i < end_section; i++) {
                 u64 flag;
@@ -692,10 +695,54 @@ int ehea_rem_sect_bmap(unsigned long pfn, unsigned long nr_pages)
         return ret;
 }
 
-static int ehea_create_busmap_callback(unsigned long pfn,
-                                       unsigned long nr_pages, void *arg)
+static int ehea_is_hugepage(unsigned long pfn)
+{
+        int page_order;
+
+        if (pfn & EHEA_HUGEPAGE_PFN_MASK)
+                return 0;
+
+        page_order = compound_order(pfn_to_page(pfn));
+        if (page_order + PAGE_SHIFT != EHEA_HUGEPAGESHIFT)
+                return 0;
+
+        return 1;
+}
+
+static int ehea_create_busmap_callback(unsigned long initial_pfn,
+                                       unsigned long total_nr_pages, void *arg)
 {
-        return ehea_update_busmap(pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
+        int ret;
+        unsigned long pfn, start_pfn, end_pfn, nr_pages;
+
+        if ((total_nr_pages * PAGE_SIZE) < EHEA_HUGEPAGE_SIZE)
+                return ehea_update_busmap(initial_pfn, total_nr_pages,
+                                          EHEA_BUSMAP_ADD_SECT);
+
+        /* Given chunk is >= 16GB -> check for hugepages */
+        start_pfn = initial_pfn;
+        end_pfn = initial_pfn + total_nr_pages;
+        pfn = start_pfn;
+
+        while (pfn < end_pfn) {
+                if (ehea_is_hugepage(pfn)) {
+                        /* Add mem found in front of the hugepage */
+                        nr_pages = pfn - start_pfn;
+                        ret = ehea_update_busmap(start_pfn, nr_pages,
+                                                 EHEA_BUSMAP_ADD_SECT);
+                        if (ret)
+                                return ret;
+
+                        /* Skip the hugepage */
+                        pfn += (EHEA_HUGEPAGE_SIZE / PAGE_SIZE);
+                        start_pfn = pfn;
+                } else
+                        pfn += (EHEA_SECTSIZE / PAGE_SIZE);
+        }
+
+        /* Add mem found behind the hugepage(s)  */
+        nr_pages = pfn - start_pfn;
+        return ehea_update_busmap(start_pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
 }
 
 int ehea_create_busmap(void)
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h
index 1e58dc06b7d2..0817c1e74a19 100644
--- a/drivers/net/ehea/ehea_qmr.h
+++ b/drivers/net/ehea/ehea_qmr.h
@@ -40,6 +40,9 @@
 #define EHEA_PAGESIZE          (1UL << EHEA_PAGESHIFT)
 #define EHEA_SECTSIZE          (1UL << 24)
 #define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)
+#define EHEA_HUGEPAGESHIFT     34
+#define EHEA_HUGEPAGE_SIZE     (1UL << EHEA_HUGEPAGESHIFT)
+#define EHEA_HUGEPAGE_PFN_MASK ((EHEA_HUGEPAGE_SIZE - 1) >> PAGE_SHIFT)
 
 #if ((1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE)
 #error eHEA module cannot work if kernel sectionsize < ehea sectionsize
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 15c422387028..013525f3c3bd 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -584,6 +584,18 @@ static void gfar_configure_serdes(struct net_device *dev)
         struct gfar_mii __iomem *regs =
                         (void __iomem *)&priv->regs->gfar_mii_regs;
         int tbipa = gfar_read(&priv->regs->tbipa);
+        struct mii_bus *bus = gfar_get_miibus(priv);
+
+        if (bus)
+                mutex_lock(&bus->mdio_lock);
+
+        /* If the link is already up, we must already be ok, and don't need to
+         * configure and reset the TBI<->SerDes link.  Maybe U-Boot configured
+         * everything for us?  Resetting it takes the link down and requires
+         * several seconds for it to come back.
+         */
+        if (gfar_local_mdio_read(regs, tbipa, MII_BMSR) & BMSR_LSTATUS)
+                goto done;
 
         /* Single clk mode, mii mode off(for serdes communication) */
         gfar_local_mdio_write(regs, tbipa, MII_TBICON, TBICON_CLK_SELECT);
@@ -594,6 +606,10 @@ static void gfar_configure_serdes(struct net_device *dev)
 
         gfar_local_mdio_write(regs, tbipa, MII_BMCR, BMCR_ANENABLE |
                         BMCR_ANRESTART | BMCR_FULLDPLX | BMCR_SPEED1000);
+
+        done:
+        if (bus)
+                mutex_unlock(&bus->mdio_lock);
 }
 
 static void init_registers(struct net_device *dev)
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index bf73eea98010..0e2595d24933 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -269,6 +269,27 @@ static struct device_driver gianfar_mdio_driver = {
         .remove = gfar_mdio_remove,
 };
 
+static int match_mdio_bus(struct device *dev, void *data)
+{
+        const struct gfar_private *priv = data;
+        const struct platform_device *pdev = to_platform_device(dev);
+
+        return !strcmp(pdev->name, gianfar_mdio_driver.name) &&
+                pdev->id == priv->einfo->mdio_bus;
+}
+
+/* Given a gfar_priv structure, find the mii_bus controlled by this device (not
+ * necessarily the same as the bus the gfar's PHY is on), if one exists.
+ * Normally only the first gianfar controls a mii_bus.  */
+struct mii_bus *gfar_get_miibus(const struct gfar_private *priv)
+{
+        /*const*/ struct device *d;
+
+        d = bus_find_device(gianfar_mdio_driver.bus, NULL, (void *)priv,
+                            match_mdio_bus);
+        return d ? dev_get_drvdata(d) : NULL;
+}
+
 int __init gfar_mdio_init(void)
 {
         return driver_register(&gianfar_mdio_driver);
diff --git a/drivers/net/gianfar_mii.h b/drivers/net/gianfar_mii.h
index 2af28b16a0e2..02dc970ca1ff 100644
--- a/drivers/net/gianfar_mii.h
+++ b/drivers/net/gianfar_mii.h
@@ -18,6 +18,8 @@
 #ifndef __GIANFAR_MII_H
 #define __GIANFAR_MII_H
 
+struct gfar_private; /* forward ref */
+
 #define MIIMIND_BUSY            0x00000001
 #define MIIMIND_NOTVALID        0x00000004
 
@@ -44,6 +46,7 @@ int gfar_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value);
 int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id,
                           int regnum, u16 value);
 int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum);
+struct mii_bus *gfar_get_miibus(const struct gfar_private *priv);
 int __init gfar_mdio_init(void);
 void gfar_mdio_exit(void);
 #endif /* GIANFAR_PHY_H */
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 1232ef9fb9ef..87a706694fb3 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2603,7 +2603,7 @@ static int __devinit emac_init_config(struct emac_instance *dev)
                     of_device_is_compatible(np, "ibm,emac-440gr"))
                         dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;
                 if (of_device_is_compatible(np, "ibm,emac-405ez")) {
-#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL
+#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
                         dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
 #else
                         printk(KERN_ERR "%s: Flow control not disabled!\n",
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 3b43bfd85a0f..b1ac63ab8c16 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -76,15 +76,6 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 
         skb->protocol = eth_type_trans(skb,dev);
 
-#ifdef LOOPBACK_TSO
-        if (skb_is_gso(skb)) {
-                BUG_ON(skb->protocol != htons(ETH_P_IP));
-                BUG_ON(ip_hdr(skb)->protocol != IPPROTO_TCP);
-
-                emulate_large_send_offload(skb);
-                return 0;
-        }
-#endif
         dev->last_rx = jiffies;
 
         /* it's OK to use per_cpu_ptr() because BHs are off */
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 1b0eebf84f76..4b9794e97a79 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -35,7 +35,6 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
-#include <linux/cpumask.h>
 
 #include <linux/mlx4/driver.h>
 #include <linux/mlx4/device.h>
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index be09fdb79cb8..cee199ceba2f 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -360,9 +360,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_PORT_ETH_MTU_OFFSET               0x02
 #define QUERY_PORT_WIDTH_OFFSET                 0x06
 #define QUERY_PORT_MAX_GID_PKEY_OFFSET          0x07
-#define QUERY_PORT_MAC_OFFSET                   0x08
 #define QUERY_PORT_MAX_MACVLAN_OFFSET           0x0a
 #define QUERY_PORT_MAX_VL_OFFSET                0x0b
+#define QUERY_PORT_MAC_OFFSET                   0x10
 
                 for (i = 1; i <= dev_cap->num_ports; ++i) {
                         err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 0, MLX4_CMD_QUERY_PORT,
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 22e6292212f7..d2cbc7d55b10 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -75,7 +75,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
 
-#define MYRI10GE_VERSION_STR "1.4.3-1.371"
+#define MYRI10GE_VERSION_STR "1.4.3-1.375"
 
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -1393,6 +1393,7 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)
                 if (tx->req == tx->done) {
                         tx->queue_active = 0;
                         put_be32(htonl(1), tx->send_stop);
+                        mmiowb();
                 }
                 __netif_tx_unlock(dev_queue);
         }
@@ -2864,6 +2865,7 @@ again:
         if ((mgp->dev->real_num_tx_queues > 1) && tx->queue_active == 0) {
                 tx->queue_active = 1;
                 put_be32(htonl(1), tx->send_go);
+                mmiowb();
         }
         tx->pkt_start++;
         if ((avail - count) < MXGEFW_MAX_SEND_DESC) {
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index ff8fe2332d3f..c22b30533a14 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -399,11 +399,11 @@ static int pppoe_rcv(struct sk_buff *skb,
         if (skb->len < len)
                 goto drop;
 
-        po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
-        if (!po)
+        if (pskb_trim_rcsum(skb, len))
                 goto drop;
 
-        if (pskb_trim_rcsum(skb, len))
+        po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
+        if (!po)
                 goto drop;
 
         return sk_receive_skb(sk_pppox(po), skb, 0);
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 37ff94bdbc83..2d8bfa7bd9e9 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2059,7 +2059,6 @@ static int smc_request_attrib(struct platform_device *pdev,
                               struct net_device *ndev)
 {
         struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib");
-        struct smc_local *lp = netdev_priv(ndev);
 
         if (!res)
                 return 0;
@@ -2074,7 +2073,6 @@ static void smc_release_attrib(struct platform_device *pdev,
                                struct net_device *ndev)
 {
         struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib");
-        struct smc_local *lp = netdev_priv(ndev);
 
         if (res)
                 release_mem_region(res->start, ATTRIB_SIZE);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 194f1825718a..0ec3281529f9 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -419,9 +419,13 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         /* Allocate Tx/Rx descriptor memory */
         db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *
                         DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
+        if (!db->desc_pool_ptr)
+                goto err_out_res;
 
         db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *
                         TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
+        if (!db->buf_pool_ptr)
+                goto err_out_free_desc;
 
         db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
         db->first_tx_desc_dma = db->desc_pool_dma_ptr;
@@ -468,7 +472,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
 
         err = register_netdev (dev);
         if (err)
-                goto err_out_res;
+                goto err_out_free_buf;
 
         printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, %pM, irq %d.\n",
                dev->name,
@@ -481,6 +485,12 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
 
         return 0;
 
+err_out_free_buf:
+        pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
+                            db->buf_pool_ptr, db->buf_pool_dma_ptr);
+err_out_free_desc:
+        pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
+                            db->desc_pool_ptr, db->desc_pool_dma_ptr);
 err_out_res:
         pci_release_regions(pdev);
 err_out_disable:
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 78df2be8a728..db3377dae9d5 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -396,6 +396,20 @@ static void dm9601_set_multicast(struct net_device *net)
         dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
 }
 
+static int dm9601_set_mac_address(struct net_device *net, void *p)
+{
+        struct sockaddr *addr = p;
+        struct usbnet *dev = netdev_priv(net);
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EINVAL;
+
+        memcpy(net->dev_addr, addr->sa_data, net->addr_len);
+        dm_write_async(dev, DM_PHY_ADDR, net->addr_len, net->dev_addr);
+
+        return 0;
+}
+
 static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
 {
         int ret;
@@ -406,6 +420,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
 
         dev->net->do_ioctl = dm9601_ioctl;
         dev->net->set_multicast_list = dm9601_set_multicast;
+        dev->net->set_mac_address = dm9601_set_mac_address;
         dev->net->ethtool_ops = &dm9601_ethtool_ops;
         dev->net->hard_header_len += DM_TX_OVERHEAD;
         dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 2dced383bcfb..3590ea5a902d 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -521,7 +521,7 @@ static void __devexit velocity_remove1(struct pci_dev *pdev)
  *      we don't duplicate code for each option.
  */
 
-static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max, int def, char *name, char *devname)
+static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max, int def, char *name, const char *devname)
 {
         if (val == -1)
                 *opt = def;
@@ -550,7 +550,7 @@ static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max,
  *      we don't duplicate code for each option.
  */
 
-static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 flag, char *name, char *devname)
+static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 flag, char *name, const char *devname)
 {
         (*opt) &= (~flag);
         if (val == -1)
@@ -576,7 +576,7 @@ static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 fla
  *      for the current device
  */
 
-static void __devinit velocity_get_options(struct velocity_opt *opts, int index, char *devname)
+static void __devinit velocity_get_options(struct velocity_opt *opts, int index, const char *devname)
 {
 
         velocity_set_int_opt(&opts->rx_thresh, rx_thresh[index], RX_THRESH_MIN, RX_THRESH_MAX, RX_THRESH_DEF, "rx_thresh", devname);
@@ -863,6 +863,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
         static int first = 1;
         struct net_device *dev;
         int i;
+        const char *drv_string;
         const struct velocity_info_tbl *info = &chip_info_table[ent->driver_data];
         struct velocity_info *vptr;
         struct mac_regs __iomem * regs;
@@ -935,7 +936,9 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
                 dev->dev_addr[i] = readb(&regs->PAR[i]);
 
 
-        velocity_get_options(&vptr->options, velocity_nics, dev->name);
+        drv_string = dev_driver_string(&pdev->dev);
+
+        velocity_get_options(&vptr->options, velocity_nics, drv_string);
 
         /*
          *      Mask out the options cannot be set to the chip
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 327d58589e12..6e92f7b44b1a 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -756,10 +756,11 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
         case CISCO_ADDR_REQ:
                 /* Stolen from net/ipv4/devinet.c -- SIOCGIFADDR ioctl */
                 {
-                struct in_device *in_dev;
-                struct in_ifaddr *ifa;
                 __be32 addr = 0, mask = htonl(~0U); /* FIXME: is the mask correct? */
 #ifdef CONFIG_INET
+                struct in_device *in_dev;
+                struct in_ifaddr *ifa;
+
                 rcu_read_lock();
                 if ((in_dev = __in_dev_get_rcu(dev)) != NULL)
                 {
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index ccd9cd35ecbe..5bf7e01ef0e9 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -695,7 +695,6 @@ EXPORT_SYMBOL(z8530_nop);
  *      z8530_interrupt - Handle an interrupt from a Z8530
  *      @irq:   Interrupt number
  *      @dev_id: The Z8530 device that is interrupting.
- *      @regs: unused
  *
  *      A Z85[2]30 device has stuck its hand in the air for attention.
  *      We scan both the channels on the chip for events and then call
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 0f1d6bdd51a2..9e47d727e220 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -661,8 +661,7 @@ ath5k_pci_resume(struct pci_dev *pdev)
 {
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct ath5k_softc *sc = hw->priv;
-        struct ath5k_hw *ah = sc->ah;
-        int i, err;
+        int err;
 
         pci_restore_state(pdev);
 
@@ -688,16 +687,6 @@ ath5k_pci_resume(struct pci_dev *pdev)
                 goto err_irq;
         ath5k_led_enable(sc);
 
-        /*
-         * Reset the key cache since some parts do not
-         * reset the contents on initial power up or resume.
-         *
-         * FIXME: This may need to be revisited when mac80211 becomes
-         *        aware of suspend/resume.
-         */
-        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
-                ath5k_hw_reset_key(ah, i);
-
         return 0;
 err_irq:
         free_irq(pdev->irq, sc);
@@ -718,7 +707,6 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
         struct ath5k_softc *sc = hw->priv;
         struct ath5k_hw *ah = sc->ah;
         u8 mac[ETH_ALEN];
-        unsigned int i;
         int ret;
 
         ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "devid 0x%x\n", pdev->device);
@@ -737,13 +725,6 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
                 __set_bit(ATH_STAT_MRRETRY, sc->status);
 
         /*
-         * Reset the key cache since some parts do not
-         * reset the contents on initial power up.
-         */
-        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
-                ath5k_hw_reset_key(ah, i);
-
-        /*
          * Collect the channel list.  The 802.11 layer
          * is resposible for filtering this list based
          * on settings like the phy mode and regulatory
@@ -2202,7 +2183,8 @@ ath5k_beacon_config(struct ath5k_softc *sc)
 static int
 ath5k_init(struct ath5k_softc *sc, bool is_resume)
 {
-        int ret;
+        struct ath5k_hw *ah = sc->ah;
+        int ret, i;
 
         mutex_lock(&sc->lock);
 
@@ -2235,10 +2217,17 @@ ath5k_init(struct ath5k_softc *sc, bool is_resume)
         if (ret)
                 goto done;
 
+        /*
+         * Reset the key cache since some parts do not reset the
+         * contents on initial power up or resume from suspend.
+         */
+        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
+                ath5k_hw_reset_key(ah, i);
+
         __set_bit(ATH_STAT_STARTED, sc->status);
 
         /* Set ack to be sent at low bit-rates */
-        ath5k_hw_set_ack_bitrate_high(sc->ah, false);
+        ath5k_hw_set_ack_bitrate_high(ah, false);
 
         mod_timer(&sc->calib_tim, round_jiffies(jiffies +
                         msecs_to_jiffies(ath5k_calinterval * 1000)));
@@ -2953,10 +2942,8 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
                 sc->opmode != NL80211_IFTYPE_MESH_POINT &&
                 test_bit(ATH_STAT_PROMISC, sc->status))
                 rfilt |= AR5K_RX_FILTER_PROM;
-        if (sc->opmode == NL80211_IFTYPE_STATION ||
-                sc->opmode == NL80211_IFTYPE_ADHOC) {
+        if (sc->opmode == NL80211_IFTYPE_ADHOC)
                 rfilt |= AR5K_RX_FILTER_BEACON;
-        }
 
         /* Set filters */
         ath5k_hw_set_rx_filter(ah,rfilt);
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c
index 8f92d670f614..19980cbd5d5f 100644
--- a/drivers/net/wireless/ath5k/debug.c
+++ b/drivers/net/wireless/ath5k/debug.c
@@ -339,7 +339,7 @@ static struct {
         { ATH5K_DEBUG_BEACON,   "beacon",       "beacon handling" },
         { ATH5K_DEBUG_CALIBRATE, "calib",       "periodic calibration" },
         { ATH5K_DEBUG_TXPOWER,  "txpower",      "transmit power setting" },
-        { ATH5K_DEBUG_LED,      "led",          "LED mamagement" },
+        { ATH5K_DEBUG_LED,      "led",          "LED management" },
         { ATH5K_DEBUG_DUMP_RX,  "dumprx",       "print received skb content" },
         { ATH5K_DEBUG_DUMP_TX,  "dumptx",       "print transmit skb content" },
         { ATH5K_DEBUG_DUMPBANDS, "dumpbands",   "dump bands" },
diff --git a/drivers/net/wireless/ath5k/initvals.c b/drivers/net/wireless/ath5k/initvals.c
index ea2e1a20b499..ceaa6c475c06 100644
--- a/drivers/net/wireless/ath5k/initvals.c
+++ b/drivers/net/wireless/ath5k/initvals.c
@@ -806,6 +806,8 @@ static const struct ath5k_ini_mode ar5212_rf5111_ini_mode_end[] = {
                 { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
         { AR5K_PHY(642),
                 { 0xd03e6788, 0xd03e6788, 0xd03e6788, 0xd03e6788, 0xd03e6788 } },
+        { 0xa228,
+                { 0x000001b5, 0x000001b5, 0x000001b5, 0x000001b5, 0x000001b5 } },
         { 0xa23c,
                 { 0x13c889af, 0x13c889af, 0x13c889af, 0x13c889af, 0x13c889af } },
 };
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c
index 8f1886834e61..1b6d45b6772d 100644
--- a/drivers/net/wireless/ath5k/reset.c
+++ b/drivers/net/wireless/ath5k/reset.c
@@ -537,9 +537,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                 mdelay(1);
 
                 /*
-                 * Write some more initial register settings
+                 * Write some more initial register settings for revised chips
                  */
-                if (ah->ah_version == AR5K_AR5212) {
+                if (ah->ah_version == AR5K_AR5212 &&
+                    ah->ah_phy_revision > 0x41) {
                         ath5k_hw_reg_write(ah, 0x0002a002, 0x982c);
 
                         if (channel->hw_value == CHANNEL_G)
@@ -558,19 +559,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                         else
                                 ath5k_hw_reg_write(ah, 0x00000000, 0x994c);
 
-                        /* Some bits are disabled here, we know nothing about
-                         * register 0xa228 yet, most of the times this ends up
-                         * with a value 0x9b5 -haven't seen any dump with
-                         * a different value- */
-                        /* Got this from decompiling binary HAL */
-                        data = ath5k_hw_reg_read(ah, 0xa228);
-                        data &= 0xfffffdff;
-                        ath5k_hw_reg_write(ah, data, 0xa228);
-
-                        data = ath5k_hw_reg_read(ah, 0xa228);
-                        data &= 0xfffe03ff;
-                        ath5k_hw_reg_write(ah, data, 0xa228);
-                        data = 0;
+                        /* Got this from legacy-hal */
+                        AR5K_REG_DISABLE_BITS(ah, 0xa228, 0x200);
+
+                        AR5K_REG_MASKED_BITS(ah, 0xa228, 0x800, 0xfffe03ff);
 
                         /* Just write 0x9b5 ? */
                         /* ath5k_hw_reg_write(ah, 0x000009b5, 0xa228); */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 2af9a14446e4..fe9307424a91 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2086,7 +2086,6 @@ static void iwl_alive_start(struct iwl_priv *priv)
                 iwl4965_error_recovery(priv);
 
         iwl_power_update_mode(priv, 1);
-        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
 
         if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
                 iwl4965_set_mode(priv, priv->iw_mode);
@@ -2338,6 +2337,7 @@ static void iwl_bg_alive_start(struct work_struct *data)
         mutex_lock(&priv->mutex);
         iwl_alive_start(priv);
         mutex_unlock(&priv->mutex);
+        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
 }
 
 static void iwl4965_bg_rf_kill(struct work_struct *work)
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 8542d85f36af..d45b07cf6a62 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -604,9 +604,9 @@ int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,
         if (ret == 0) {
                 *curlevel = le16_to_cpu(cmd.curlevel);
                 if (minlevel)
-                        *minlevel = le16_to_cpu(cmd.minlevel);
+                        *minlevel = cmd.minlevel;
                 if (maxlevel)
-                        *maxlevel = le16_to_cpu(cmd.maxlevel);
+                        *maxlevel = cmd.maxlevel;
         }
 
         lbs_deb_leave(LBS_DEB_CMD);
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index fcaef38d5df9..351b3f6e5664 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -596,8 +596,8 @@ static int lbs_process_bss(struct bss_descriptor *bss,
 
                 switch (elem->id) {
                 case MFIE_TYPE_SSID:
-                        bss->ssid_len = elem->len;
-                        memcpy(bss->ssid, elem->data, elem->len);
+                        bss->ssid_len = min_t(int, 32, elem->len);
+                        memcpy(bss->ssid, elem->data, bss->ssid_len);
                         lbs_deb_scan("got SSID IE: '%s', len %u\n",
                                      escape_essid(bss->ssid, bss->ssid_len),
                                      bss->ssid_len);
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 72859decd907..6370c44c64d5 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -319,7 +319,7 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
         void *tmp;
         int err;
         u8 *end = (u8 *)eeprom + len;
-        u16 synth;
+        u16 synth = 0;
 
         wrap = (struct eeprom_pda_wrap *) eeprom;
         entry = (void *)wrap->data + le16_to_cpu(wrap->len);
@@ -421,7 +421,8 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                 entry = (void *)entry + (entry_len + 1)*2;
         }
 
-        if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) {
+        if (!synth || !priv->iq_autocal || !priv->output_limit ||
+            !priv->curve_data) {
                 printk(KERN_ERR "p54: not all required entries found in eeprom!\n");
                 err = -EINVAL;
                 goto err;
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 194237b66424..bba2c90e533f 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -346,68 +346,6 @@ static void p54p_tx(struct ieee80211_hw *dev, struct p54_control_hdr *data,
                 printk(KERN_INFO "%s: tx overflow.\n", wiphy_name(dev->wiphy));
 }
 
-static int p54p_open(struct ieee80211_hw *dev)
-{
-        struct p54p_priv *priv = dev->priv;
-        int err;
-
-        init_completion(&priv->boot_comp);
-        err = request_irq(priv->pdev->irq, &p54p_interrupt,
-                          IRQF_SHARED, "p54pci", dev);
-        if (err) {
-                printk(KERN_ERR "%s: failed to register IRQ handler\n",
-                       wiphy_name(dev->wiphy));
-                return err;
-        }
-
-        memset(priv->ring_control, 0, sizeof(*priv->ring_control));
-        err = p54p_upload_firmware(dev);
-        if (err) {
-                free_irq(priv->pdev->irq, dev);
-                return err;
-        }
-        priv->rx_idx_data = priv->tx_idx_data = 0;
-        priv->rx_idx_mgmt = priv->tx_idx_mgmt = 0;
-
-        p54p_refill_rx_ring(dev, 0, priv->ring_control->rx_data,
-                ARRAY_SIZE(priv->ring_control->rx_data), priv->rx_buf_data);
-
-        p54p_refill_rx_ring(dev, 2, priv->ring_control->rx_mgmt,
-                ARRAY_SIZE(priv->ring_control->rx_mgmt), priv->rx_buf_mgmt);
-
-        P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
-        P54P_READ(ring_control_base);
-        wmb();
-        udelay(10);
-
-        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
-        P54P_READ(int_enable);
-        wmb();
-        udelay(10);
-
-        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
-        P54P_READ(dev_int);
-
-        if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
-                printk(KERN_ERR "%s: Cannot boot firmware!\n",
-                       wiphy_name(dev->wiphy));
-                free_irq(priv->pdev->irq, dev);
-                return -ETIMEDOUT;
-        }
-
-        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
-        P54P_READ(int_enable);
-        wmb();
-        udelay(10);
-
-        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
-        P54P_READ(dev_int);
-        wmb();
-        udelay(10);
-
-        return 0;
-}
-
 static void p54p_stop(struct ieee80211_hw *dev)
 {
         struct p54p_priv *priv = dev->priv;
@@ -474,6 +412,68 @@ static void p54p_stop(struct ieee80211_hw *dev)
         memset(ring_control, 0, sizeof(*ring_control));
 }
 
+static int p54p_open(struct ieee80211_hw *dev)
+{
+        struct p54p_priv *priv = dev->priv;
+        int err;
+
+        init_completion(&priv->boot_comp);
+        err = request_irq(priv->pdev->irq, &p54p_interrupt,
+                          IRQF_SHARED, "p54pci", dev);
+        if (err) {
+                printk(KERN_ERR "%s: failed to register IRQ handler\n",
+                       wiphy_name(dev->wiphy));
+                return err;
+        }
+
+        memset(priv->ring_control, 0, sizeof(*priv->ring_control));
+        err = p54p_upload_firmware(dev);
+        if (err) {
+                free_irq(priv->pdev->irq, dev);
+                return err;
+        }
+        priv->rx_idx_data = priv->tx_idx_data = 0;
+        priv->rx_idx_mgmt = priv->tx_idx_mgmt = 0;
+
+        p54p_refill_rx_ring(dev, 0, priv->ring_control->rx_data,
+                ARRAY_SIZE(priv->ring_control->rx_data), priv->rx_buf_data);
+
+        p54p_refill_rx_ring(dev, 2, priv->ring_control->rx_mgmt,
+                ARRAY_SIZE(priv->ring_control->rx_mgmt), priv->rx_buf_mgmt);
+
+        P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
+        P54P_READ(ring_control_base);
+        wmb();
+        udelay(10);
+
+        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
+        P54P_READ(int_enable);
+        wmb();
+        udelay(10);
+
+        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
+        P54P_READ(dev_int);
+
+        if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
+                printk(KERN_ERR "%s: Cannot boot firmware!\n",
+                       wiphy_name(dev->wiphy));
+                p54p_stop(dev);
+                return -ETIMEDOUT;
+        }
+
+        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
+        P54P_READ(int_enable);
+        wmb();
+        udelay(10);
+
+        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
+        P54P_READ(dev_int);
+        wmb();
+        udelay(10);
+
+        return 0;
+}
+
 static int __devinit p54p_probe(struct pci_dev *pdev,
                                 const struct pci_device_id *id)
 {
@@ -555,11 +555,13 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
         spin_lock_init(&priv->lock);
         tasklet_init(&priv->rx_tasklet, p54p_rx_tasklet, (unsigned long)dev);
 
-        p54p_open(dev);
+        err = p54p_open(dev);
+        if (err)
+                goto err_free_common;
         err = p54_read_eeprom(dev);
         p54p_stop(dev);
         if (err)
-                goto err_free_desc;
+                goto err_free_common;
 
         err = ieee80211_register_hw(dev);
         if (err) {
@@ -572,8 +574,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
  err_free_common:
         p54_free_common(dev);
-
- err_free_desc:
         pci_free_consistent(pdev, sizeof(*priv->ring_control),
                             priv->ring_control, priv->ring_control_dma);
 
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index f839ce044afd..95511ac22470 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -1,5 +1,5 @@
 menuconfig RT2X00
-        bool "Ralink driver support"
+        tristate "Ralink driver support"
         depends on MAC80211 && WLAN_80211 && EXPERIMENTAL
         ---help---
           This will enable the experimental support for the Ralink drivers,
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index b1899e9c1f65..0cd5fbc7f2c2 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -112,7 +112,7 @@ static int parport_probe(struct pcmcia_device *link)
 
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 96cf8ecd04ce..bbf66ea8fd87 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -43,20 +43,6 @@ static void __devinit quirk_mellanox_tavor(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR,quirk_mellanox_tavor);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE,quirk_mellanox_tavor);
 
-/* Many VIA bridges seem to corrupt data for DAC. Disable it here */
-int forbid_dac __read_mostly;
-EXPORT_SYMBOL(forbid_dac);
-
-static __devinit void via_no_dac(struct pci_dev *dev)
-{
-        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {
-                dev_info(&dev->dev,
-                        "VIA PCI bridge detected. Disabling DAC.\n");
-                forbid_dac = 1;
-        }
-}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_ANY_ID, via_no_dac);
-
 /* Deal with broken BIOS'es that neglect to enable passive release,
    which can cause problems in combination with the 82441FX/PPro MTRRs */
 static void quirk_passive_release(struct pci_dev *dev)
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index afea2b2558b5..76d4a98f0955 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -693,8 +693,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         type = 0;
         if (s->functions > 1)           /* All of this ought to be handled higher up */
                 type = IRQF_SHARED;
-        if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
+        else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
                 type = IRQF_SHARED;
+        else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
 
 #ifdef CONFIG_PCMCIA_PROBE
 
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 3688e339db87..773b29cec8be 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -79,6 +79,11 @@ struct da903x_regulator_info {
         int     enable_bit;
 };
 
+static inline struct device *to_da903x_dev(struct regulator_dev *rdev)
+{
+        return rdev_get_dev(rdev)->parent->parent;
+}
+
 static inline int check_range(struct da903x_regulator_info *info,
                                 int min_uV, int max_uV)
 {
@@ -93,7 +98,7 @@ static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
                                   int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
 
         if (check_range(info, min_uV, max_uV)) {
@@ -111,7 +116,7 @@ static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
 static int da903x_get_voltage(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -128,7 +133,7 @@ static int da903x_get_voltage(struct regulator_dev *rdev)
 static int da903x_enable(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
 
         return da903x_set_bits(da9034_dev, info->enable_reg,
                                         1 << info->enable_bit);
@@ -137,7 +142,7 @@ static int da903x_enable(struct regulator_dev *rdev)
 static int da903x_disable(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
 
         return da903x_clr_bits(da9034_dev, info->enable_reg,
                                         1 << info->enable_bit);
@@ -146,7 +151,7 @@ static int da903x_disable(struct regulator_dev *rdev)
 static int da903x_is_enabled(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t reg_val;
         int ret;
 
@@ -162,7 +167,7 @@ static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
                                        int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -189,7 +194,7 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
                                   int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int thresh;
 
@@ -215,7 +220,7 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
 static int da9030_get_ldo14_voltage(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -238,7 +243,7 @@ static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
                                   int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -264,7 +269,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
                                     int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
 
         if (check_range(info, min_uV, max_uV)) {
@@ -283,7 +288,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
 static int da9034_get_ldo12_voltage(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -466,7 +471,7 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
         if (ri->desc.id == DA9030_ID_LDO1 || ri->desc.id == DA9030_ID_LDO15)
                 ri->desc.ops = &da9030_regulator_ldo1_15_ops;
 
-        rdev = regulator_register(&ri->desc, pdev->dev.parent, ri);
+        rdev = regulator_register(&ri->desc, &pdev->dev, ri);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
index 37d131d03f33..45e5b106af73 100644
--- a/drivers/rtc/rtc-ds3234.c
+++ b/drivers/rtc/rtc-ds3234.c
@@ -189,7 +189,7 @@ static const struct rtc_class_ops ds3234_rtc_ops = {
         .set_time       = ds3234_set_time,
 };
 
-static int ds3234_probe(struct spi_device *spi)
+static int __devinit ds3234_probe(struct spi_device *spi)
 {
         struct rtc_device *rtc;
         unsigned char tmp;
@@ -249,7 +249,7 @@ static int ds3234_probe(struct spi_device *spi)
         return 0;
 }
 
-static int __exit ds3234_remove(struct spi_device *spi)
+static int __devexit ds3234_remove(struct spi_device *spi)
 {
         struct ds3234 *chip = platform_get_drvdata(spi);
         struct rtc_device *rtc = chip->rtc;
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 910bc704939c..f59277bbedaa 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -455,6 +455,8 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 
         s3c_rtc_setfreq(&pdev->dev, 1);
 
+        device_init_wakeup(&pdev->dev, 1);
+
         /* register RTC and exit */
 
         rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops,
@@ -507,7 +509,7 @@ static int s3c_rtc_resume(struct platform_device *pdev)
 #define s3c_rtc_resume  NULL
 #endif
 
-static struct platform_driver s3c2410_rtcdrv = {
+static struct platform_driver s3c2410_rtc_driver = {
         .probe          = s3c_rtc_probe,
         .remove         = __devexit_p(s3c_rtc_remove),
         .suspend        = s3c_rtc_suspend,
@@ -523,12 +525,12 @@ static char __initdata banner[] = "S3C24XX RTC, (c) 2004,2006 Simtec Electronics
 static int __init s3c_rtc_init(void)
 {
         printk(banner);
-        return platform_driver_register(&s3c2410_rtcdrv);
+        return platform_driver_register(&s3c2410_rtc_driver);
 }
 
 static void __exit s3c_rtc_exit(void)
 {
-        platform_driver_unregister(&s3c2410_rtcdrv);
+        platform_driver_unregister(&s3c2410_rtc_driver);
 }
 
 module_init(s3c_rtc_init);
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 023803dbb0c7..ae18baf59f06 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -76,7 +76,7 @@ tapeblock_trigger_requeue(struct tape_device *device)
 static void
 tapeblock_end_request(struct request *req, int error)
 {
-        if (__blk_end_request(req, error, blk_rq_bytes(req)))
+        if (blk_end_request(req, error, blk_rq_bytes(req)))
                 BUG();
 }
 
@@ -166,7 +166,7 @@ tapeblock_requeue(struct work_struct *work) {
                 nr_queued++;
         spin_unlock(get_ccwdev_lock(device->cdev));
 
-        spin_lock(&device->blk_data.request_queue_lock);
+        spin_lock_irq(&device->blk_data.request_queue_lock);
         while (
                 !blk_queue_plugged(queue) &&
                 elv_next_request(queue)   &&
@@ -176,7 +176,9 @@ tapeblock_requeue(struct work_struct *work) {
                 if (rq_data_dir(req) == WRITE) {
                         DBF_EVENT(1, "TBLOCK: Rejecting write request\n");
                         blkdev_dequeue_request(req);
+                        spin_unlock_irq(&device->blk_data.request_queue_lock);
                         tapeblock_end_request(req, -EIO);
+                        spin_lock_irq(&device->blk_data.request_queue_lock);
                         continue;
                 }
                 blkdev_dequeue_request(req);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index d7073dbf825c..f9bb51fa7f5b 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -1200,7 +1200,7 @@ tape_open(struct tape_device *device)
 {
         int rc;
 
-        spin_lock(get_ccwdev_lock(device->cdev));
+        spin_lock_irq(get_ccwdev_lock(device->cdev));
         if (device->tape_state == TS_NOT_OPER) {
                 DBF_EVENT(6, "TAPE:nodev\n");
                 rc = -ENODEV;
@@ -1218,7 +1218,7 @@ tape_open(struct tape_device *device)
                 tape_state_set(device, TS_IN_USE);
                 rc = 0;
         }
-        spin_unlock(get_ccwdev_lock(device->cdev));
+        spin_unlock_irq(get_ccwdev_lock(device->cdev));
         return rc;
 }
 
@@ -1228,11 +1228,11 @@ tape_open(struct tape_device *device)
 int
 tape_release(struct tape_device *device)
 {
-        spin_lock(get_ccwdev_lock(device->cdev));
+        spin_lock_irq(get_ccwdev_lock(device->cdev));
         if (device->tape_state == TS_IN_USE)
                 tape_state_set(device, TS_UNUSED);
         module_put(device->discipline->owner);
-        spin_unlock(get_ccwdev_lock(device->cdev));
+        spin_unlock_irq(get_ccwdev_lock(device->cdev));
         return 0;
 }
 
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index b5390821434f..f05590355be8 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -20,6 +20,7 @@ static struct dentry *debugfs_root;
 #define MAX_DEBUGFS_QUEUES      32
 static struct dentry *debugfs_queues[MAX_DEBUGFS_QUEUES] = { NULL };
 static DEFINE_MUTEX(debugfs_mutex);
+#define QDIO_DEBUGFS_NAME_LEN   40
 
 void qdio_allocate_do_dbf(struct qdio_initialize *init_data)
 {
@@ -152,17 +153,6 @@ static int qstat_seq_open(struct inode *inode, struct file *filp)
                            filp->f_path.dentry->d_inode->i_private);
 }
 
-static void get_queue_name(struct qdio_q *q, struct ccw_device *cdev, char *name)
-{
-        memset(name, 0, sizeof(name));
-        sprintf(name, "%s", dev_name(&cdev->dev));
-        if (q->is_input_q)
-                sprintf(name + strlen(name), "_input");
-        else
-                sprintf(name + strlen(name), "_output");
-        sprintf(name + strlen(name), "_%d", q->nr);
-}
-
 static void remove_debugfs_entry(struct qdio_q *q)
 {
         int i;
@@ -189,14 +179,17 @@ static struct file_operations debugfs_fops = {
 static void setup_debugfs_entry(struct qdio_q *q, struct ccw_device *cdev)
 {
         int i = 0;
-        char name[40];
+        char name[QDIO_DEBUGFS_NAME_LEN];
 
         while (debugfs_queues[i] != NULL) {
                 i++;
                 if (i >= MAX_DEBUGFS_QUEUES)
                         return;
         }
-        get_queue_name(q, cdev, name);
+        snprintf(name, QDIO_DEBUGFS_NAME_LEN, "%s_%s_%d",
+                 dev_name(&cdev->dev),
+                 q->is_input_q ? "input" : "output",
+                 q->nr);
         debugfs_queues[i] = debugfs_create_file(name, S_IFREG | S_IRUGO | S_IWUSR,
                                                 debugfs_root, q, &debugfs_fops);
 }
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index a50682d2a0fa..7c8659151993 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -1083,7 +1083,6 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
                 case -EIO:
                         sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no);
                         QDIO_DBF_TEXT2(1, setup, dbf_text);
-                        qdio_int_error(cdev);
                         return;
                 case -ETIMEDOUT:
                         sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 7de410d5be4a..52d26592c72c 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3025,7 +3025,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
         struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill,
         int offset)
 {
-        int length = skb->len - offset;
+        int length = skb->len;
         int length_here;
         int element;
         char *data;
@@ -3037,6 +3037,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
 
         if (offset >= 0) {
                 data = skb->data + offset;
+                length -= offset;
                 first_lap = 0;
         }
 
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 18623ef01287..8a8fad7a8bea 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -367,8 +367,6 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
         qeth_set_allowed_threads(card, 0, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
-                return -ERESTARTSYS;
         if (card->read.state == CH_STATE_UP &&
             card->write.state == CH_STATE_UP &&
             (card->state == CARD_STATE_UP)) {
@@ -445,12 +443,15 @@ static void qeth_l2_process_inbound_buffer(struct qeth_card *card,
                         netif_rx(skb);
                         break;
                 case QETH_HEADER_TYPE_OSN:
-                        skb_push(skb, sizeof(struct qeth_hdr));
-                        skb_copy_to_linear_data(skb, hdr,
+                        if (card->info.type == QETH_CARD_TYPE_OSN) {
+                                skb_push(skb, sizeof(struct qeth_hdr));
+                                skb_copy_to_linear_data(skb, hdr,
                                                 sizeof(struct qeth_hdr));
-                        len = skb->len;
-                        card->osn_info.data_cb(skb);
-                        break;
+                                len = skb->len;
+                                card->osn_info.data_cb(skb);
+                                break;
+                        }
+                        /* else unknown */
                 default:
                         dev_kfree_skb_any(skb);
                         QETH_DBF_TEXT(TRACE, 3, "inbunkno");
@@ -969,12 +970,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
         qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
-                PRINT_WARN("set_online of card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
-
         recover_flag = card->state;
         rc = ccw_device_set_online(CARD_RDEV(card));
         if (rc) {
@@ -1085,11 +1080,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev,
         if (card->dev && netif_carrier_ok(card->dev))
                 netif_carrier_off(card->dev);
         recover_flag = card->state;
-        if (qeth_l2_stop_card(card, recovery_mode) == -ERESTARTSYS) {
-                PRINT_WARN("Stopping card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
+        qeth_l2_stop_card(card, recovery_mode);
         rc  = ccw_device_set_offline(CARD_DDEV(card));
         rc2 = ccw_device_set_offline(CARD_WDEV(card));
         rc3 = ccw_device_set_offline(CARD_RDEV(card));
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 99547dea44de..ed59fedd5922 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2064,8 +2064,6 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
         qeth_set_allowed_threads(card, 0, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
-                return -ERESTARTSYS;
         if (card->read.state == CH_STATE_UP &&
             card->write.state == CH_STATE_UP &&
             (card->state == CARD_STATE_UP)) {
@@ -3049,11 +3047,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
         qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
-                PRINT_WARN("set_online of card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
 
         recover_flag = card->state;
         rc = ccw_device_set_online(CARD_RDEV(card));
@@ -3170,11 +3163,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
         if (card->dev && netif_carrier_ok(card->dev))
                 netif_carrier_off(card->dev);
         recover_flag = card->state;
-        if (qeth_l3_stop_card(card, recovery_mode) == -ERESTARTSYS) {
-                PRINT_WARN("Stopping card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
+        qeth_l3_stop_card(card, recovery_mode);
         rc  = ccw_device_set_offline(CARD_DDEV(card));
         rc2 = ccw_device_set_offline(CARD_WDEV(card));
         rc3 = ccw_device_set_offline(CARD_RDEV(card));
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index 210ddb639748..c144b9924d52 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -121,9 +121,6 @@ static ssize_t qeth_l3_dev_route6_show(struct device *dev,
         if (!card)
                 return -EINVAL;
 
-        if (!qeth_is_supported(card, IPA_IPV6))
-                return sprintf(buf, "%s\n", "n/a");
-
         return qeth_l3_dev_route_show(card, &card->options.route6, buf);
 }
 
@@ -135,10 +132,6 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev,
         if (!card)
                 return -EINVAL;
 
-        if (!qeth_is_supported(card, IPA_IPV6)) {
-                return -EOPNOTSUPP;
-        }
-
         return qeth_l3_dev_route_store(card, &card->options.route6,
                                 QETH_PROT_IPV6, buf, count);
 }
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index c33bcb284df7..56f4e6bffc21 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -290,9 +290,11 @@
 #include <scsi/scsi_ioctl.h>
 #include "fdomain.h"
 
+#ifndef PCMCIA
 MODULE_AUTHOR("Rickard E. Faith");
 MODULE_DESCRIPTION("Future domain SCSI driver");
 MODULE_LICENSE("GPL");
+#endif
 
   
 #define VERSION          "$Revision: 5.51 $"
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index c94d3c4b7521..579d63a81aa2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3
           say Y or M.  Otherwise, say N.
 
 config SERIAL_NETX
-        bool "NetX serial port support"
+        tristate "NetX serial port support"
         depends on ARM && ARCH_NETX
         select SERIAL_CORE
         help
@@ -1288,7 +1288,7 @@ config SERIAL_NETX
 
 config SERIAL_NETX_CONSOLE
         bool "Console on NetX serial port"
-        depends on SERIAL_NETX
+        depends on SERIAL_NETX=y
         select SERIAL_CORE_CONSOLE
         help
           If you have enabled the serial port on the Hilscher NetX SoC
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c
index 3f489329e8d3..3e5dda8518b7 100644
--- a/drivers/serial/netx-serial.c
+++ b/drivers/serial/netx-serial.c
@@ -42,8 +42,6 @@
 #define SERIAL_NX_MAJOR 204
 #define MINOR_START     170
 
-#ifdef CONFIG_SERIAL_NETX_CONSOLE
-
 enum uart_regs {
         UART_DR              = 0x00,
         UART_SR              = 0x04,
@@ -528,6 +526,8 @@ static struct netx_port netx_ports[] = {
         }
 };
 
+#ifdef CONFIG_SERIAL_NETX_CONSOLE
+
 static void netx_console_putchar(struct uart_port *port, int ch)
 {
         while (readl(port->membase + UART_FR) & FR_BUSY);
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 543811f6e6e8..8e74657f106c 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -133,7 +133,7 @@ static int usbtmc_release(struct inode *inode, struct file *file)
 
 static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)
 {
-        char *buffer;
+        u8 *buffer;
         struct device *dev;
         int rv;
         int n;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index fc9018e72a09..e1b42626d04d 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -106,6 +106,9 @@ static DEFINE_SPINLOCK(hcd_root_hub_lock);
 /* used when updating an endpoint's URB list */
 static DEFINE_SPINLOCK(hcd_urb_list_lock);
 
+/* used to protect against unlinking URBs after the device is gone */
+static DEFINE_SPINLOCK(hcd_urb_unlink_lock);
+
 /* wait queue for synchronous unlinks */
 DECLARE_WAIT_QUEUE_HEAD(usb_kill_urb_queue);
 
@@ -1376,10 +1379,25 @@ static int unlink1(struct usb_hcd *hcd, struct urb *urb, int status)
 int usb_hcd_unlink_urb (struct urb *urb, int status)
 {
         struct usb_hcd          *hcd;
-        int                     retval;
+        int                     retval = -EIDRM;
+        unsigned long           flags;
 
-        hcd = bus_to_hcd(urb->dev->bus);
-        retval = unlink1(hcd, urb, status);
+        /* Prevent the device and bus from going away while
+         * the unlink is carried out.  If they are already gone
+         * then urb->use_count must be 0, since disconnected
+         * devices can't have any active URBs.
+         */
+        spin_lock_irqsave(&hcd_urb_unlink_lock, flags);
+        if (atomic_read(&urb->use_count) > 0) {
+                retval = 0;
+                usb_get_dev(urb->dev);
+        }
+        spin_unlock_irqrestore(&hcd_urb_unlink_lock, flags);
+        if (retval == 0) {
+                hcd = bus_to_hcd(urb->dev->bus);
+                retval = unlink1(hcd, urb, status);
+                usb_put_dev(urb->dev);
+        }
 
         if (retval == 0)
                 retval = -EINPROGRESS;
@@ -1528,6 +1546,17 @@ void usb_hcd_disable_endpoint(struct usb_device *udev,
                 hcd->driver->endpoint_disable(hcd, ep);
 }
 
+/* Protect against drivers that try to unlink URBs after the device
+ * is gone, by waiting until all unlinks for @udev are finished.
+ * Since we don't currently track URBs by device, simply wait until
+ * nothing is running in the locked region of usb_hcd_unlink_urb().
+ */
+void usb_hcd_synchronize_unlinks(struct usb_device *udev)
+{
+        spin_lock_irq(&hcd_urb_unlink_lock);
+        spin_unlock_irq(&hcd_urb_unlink_lock);
+}
+
 /*-------------------------------------------------------------------------*/
 
 /* called in any context */
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 2dcde61c465e..9465e70f4dd0 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -232,6 +232,7 @@ extern void usb_hcd_flush_endpoint(struct usb_device *udev,
                 struct usb_host_endpoint *ep);
 extern void usb_hcd_disable_endpoint(struct usb_device *udev,
                 struct usb_host_endpoint *ep);
+extern void usb_hcd_synchronize_unlinks(struct usb_device *udev);
 extern int usb_hcd_get_frame_number(struct usb_device *udev);
 
 extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 9b3f16bd12cb..b19cbfcd51da 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -659,6 +659,9 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                         PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func2);
                         schedule_delayed_work(&hub->init_work,
                                         msecs_to_jiffies(delay));
+
+                        /* Suppress autosuspend until init is done */
+                        to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
                         return;         /* Continues at init2: below */
                 } else {
                         hub_power_on(hub, true);
@@ -1429,6 +1432,7 @@ void usb_disconnect(struct usb_device **pdev)
          */
         dev_dbg (&udev->dev, "unregistering device\n");
         usb_disable_device(udev, 0);
+        usb_hcd_synchronize_unlinks(udev);
 
         usb_unlock_device(udev);
 
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index f2638009a464..4342bd9c3bb6 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -474,6 +474,12 @@ EXPORT_SYMBOL_GPL(usb_submit_urb);
  * indicating that the request has been canceled (rather than any other
  * code).
  *
+ * Drivers should not call this routine or related routines, such as
+ * usb_kill_urb() or usb_unlink_anchored_urbs(), after their disconnect
+ * method has returned.  The disconnect function should synchronize with
+ * a driver's I/O routines to insure that all URB-related activity has
+ * completed before it returns.
+ *
  * This request is always asynchronous.  Success is indicated by
  * returning -EINPROGRESS, at which time the URB will probably not yet
  * have been given back to the device driver.  When it is eventually
@@ -550,6 +556,9 @@ EXPORT_SYMBOL_GPL(usb_unlink_urb);
  * This routine may not be used in an interrupt context (such as a bottom
  * half or a completion handler), or when holding a spinlock, or in other
  * situations where the caller can't schedule().
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_kill_urb(struct urb *urb)
 {
@@ -588,6 +597,9 @@ EXPORT_SYMBOL_GPL(usb_kill_urb);
  * This routine may not be used in an interrupt context (such as a bottom
  * half or a completion handler), or when holding a spinlock, or in other
  * situations where the caller can't schedule().
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_poison_urb(struct urb *urb)
 {
@@ -622,6 +634,9 @@ EXPORT_SYMBOL_GPL(usb_unpoison_urb);
  *
  * this allows all outstanding URBs to be killed starting
  * from the back of the queue
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_kill_anchored_urbs(struct usb_anchor *anchor)
 {
@@ -651,6 +666,9 @@ EXPORT_SYMBOL_GPL(usb_kill_anchored_urbs);
  * this allows all outstanding URBs to be poisoned starting
  * from the back of the queue. Newly added URBs will also be
  * poisoned
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_poison_anchored_urbs(struct usb_anchor *anchor)
 {
@@ -672,6 +690,7 @@ void usb_poison_anchored_urbs(struct usb_anchor *anchor)
         spin_unlock_irq(&anchor->lock);
 }
 EXPORT_SYMBOL_GPL(usb_poison_anchored_urbs);
+
 /**
  * usb_unlink_anchored_urbs - asynchronously cancel transfer requests en masse
  * @anchor: anchor the requests are bound to
@@ -680,6 +699,9 @@ EXPORT_SYMBOL_GPL(usb_poison_anchored_urbs);
  * from the back of the queue. This function is asynchronous.
  * The unlinking is just tiggered. It may happen after this
  * function has returned.
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_unlink_anchored_urbs(struct usb_anchor *anchor)
 {
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8be3f39891c7..794b5ffe4397 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -281,6 +281,7 @@ static void serial_close(struct tty_struct *tty, struct file *filp)
                         if (tty->driver_data)
                                 tty->driver_data = NULL;
                         tty_port_tty_set(&port->port, NULL);
+                        tty_kref_put(tty);
                 }
         }
 
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index a2b9ebbef38e..fb9e20e624c1 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -333,6 +333,13 @@ UNUSUAL_DEV(  0x0482, 0x0103, 0x0100, 0x0100,
                 "Finecam S5",
                 US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
 
+/* Patch submitted by Jens Taprogge <jens.taprogge@taprogge.org> */
+UNUSUAL_DEV(  0x0482, 0x0107, 0x0100, 0x0100,
+                "Kyocera",
+                "CONTAX SL300R T*",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE),
+
 /* Reported by Paul Stewart <stewart@wetlogic.net>
  * This entry is needed because the device reports Sub=ff */
 UNUSUAL_DEV(  0x04a4, 0x0004, 0x0001, 0x0001,
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index 2afd47eefe74..f8a4bb20f41a 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -439,7 +439,7 @@ static int corgi_bl_update_status(struct backlight_device *bd)
         return corgi_bl_set_intensity(lcd, intensity);
 }
 
-void corgibl_limit_intensity(int limit)
+void corgi_lcd_limit_intensity(int limit)
 {
         if (limit)
                 corgibl_flags |= CORGIBL_BATTLOW;
@@ -448,7 +448,7 @@ void corgibl_limit_intensity(int limit)
 
         backlight_update_status(the_corgi_lcd->bl_dev);
 }
-EXPORT_SYMBOL(corgibl_limit_intensity);
+EXPORT_SYMBOL(corgi_lcd_limit_intensity);
 
 static struct backlight_ops corgi_bl_ops = {
         .get_brightness = corgi_bl_get_intensity,
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 64b3d30027b8..b92947d62ad6 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2118,7 +2118,7 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
                    height, width);
 }
 
-static __inline__ void updatescrollmode(struct display *p,
+static void updatescrollmode(struct display *p,
                                         struct fb_info *info,
                                         struct vc_data *vc)
 {
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index cd5f20da738a..6048b55f2878 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1262,8 +1262,8 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case FBIOPUT_CON2FBMAP:
                 arg = (unsigned long) compat_ptr(arg);
         case FBIOBLANK:
-                ret = fb_ioctl(file, cmd, arg);
-                break;
+                mutex_unlock(&info->lock);
+                return fb_ioctl(file, cmd, arg);
 
         case FBIOGET_FSCREENINFO:
                 ret = fb_get_fscreeninfo(inode, file, cmd, arg);
diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h
index 8e5263c5b812..7543d5f7e309 100644
--- a/drivers/video/via/global.h
+++ b/drivers/video/via/global.h
@@ -38,7 +38,6 @@
 #include "iface.h"
 #include "viafbdev.h"
 #include "chip.h"
-#include "debug.h"
 #include "accel.h"
 #include "share.h"
 #include "dvi.h"
@@ -48,12 +47,10 @@
 
 #include "lcd.h"
 #include "ioctl.h"
-#include "viamode.h"
 #include "via_utility.h"
 #include "vt1636.h"
 #include "tblDPASetting.h"
 #include "tbl1636.h"
-#include "viafbdev.h"
 
 /* External struct*/
 
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 6e46a551395c..3e57aa4d643a 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -3,8 +3,8 @@
  *
  *      Based on wdt.c. Original copyright messages:
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -15,7 +15,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index a5110f93a755..a1d7856ea6e0 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -6,8 +6,8 @@
  *      Based on acquirewdt.c which is based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 31b42253054e..067a57cb3f82 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -5,7 +5,7 @@
  * Originally based on softdog.c
  * Copyright 2006-2007 Analog Devices Inc.
  * Copyright 2006-2007 Michele d'Amico
- * Copyright 1996 Alan Cox <alan@redhat.com>
+ * Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * Enter bugs at http://blackfin.uclinux.org/
  *
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index bbd14e34319f..a171fc6ae1cb 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -8,8 +8,8 @@
  *      Based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index c13383f7fcb9..74f951c18b90 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -394,8 +394,7 @@ static unsigned char __init esb_getdevice(void)
                         goto err_disable;
                 }
 
-                BASEADDR = ioremap(pci_resource_start(esb_pci, 0),
-                                   pci_resource_len(esb_pci, 0));
+                BASEADDR = pci_ioremap_bar(esb_pci, 0);
                 if (BASEADDR == NULL) {
                         /* Something's wrong here, BASEADDR has to be set */
                         printk(KERN_ERR PFX "failed to get BASEADDR\n");
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 8782ec1f5aa0..317ef2b16cff 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -11,8 +11,8 @@
  *      Based on acquirewdt.c which is based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *           Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index 73c9e7992feb..0f761db9a27c 100644
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -9,7 +9,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  *
- *      based on softdog.c by Alan Cox <alan@redhat.com>
+ *      based on softdog.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
  */
 
 #include <linux/module.h>
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 2a9bfa81f9d6..1130ad697ce2 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -4,8 +4,8 @@
  *      (c) Copyright 2004 ARM Limited
  *
  *      Based on the SoftDog driver:
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 7bcbb7f4745f..2f2ce7429f5b 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -16,7 +16,7 @@
  * 20030527: George G. Davis <gdavis@mvista.com>
  *      Initially based on linux-2.4.19-rmk7-pxa1/drivers/char/sa1100_wdt.c
  *      (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
- *      Based on SoftDog driver by Alan Cox <alan@redhat.com>
+ *      Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * Copyright (c) 2004 Texas Instruments.
  *      1. Modified to support OMAP1610 32-KHz watchdog timer
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 90eb1d4271d7..5d76422c402c 100644
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -6,7 +6,7 @@
  *      Based on source code of the following authors:
  *        Ken Hollis <kenji@bitgate.com>,
  *        Lindsay Harris <lindsay@bluegum.com>,
- *        Alan Cox <alan@redhat.com>,
+ *        Alan Cox <alan@lxorguk.ukuu.org.uk>,
  *        Matt Domsch <Matt_Domsch@dell.com>,
  *        Rob Radez <rob@osinvestor.com>
  *
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index c1685c942de6..afb089695da8 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -5,7 +5,7 @@
  *
  *      Based on source code of the following authors:
  *        Ken Hollis <kenji@bitgate.com>,
- *        Alan Cox <alan@redhat.com>,
+ *        Alan Cox <alan@lxorguk.ukuu.org.uk>,
  *        Matt Domsch <Matt_Domsch@dell.com>,
  *        Rob Radez <rob@osinvestor.com>,
  *        Greg Kroah-Hartman <greg@kroah.com>
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index c9c73b69c5e5..57027f4653ce 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -7,7 +7,8 @@
  *  based on
  *  SoftDog 0.05:       A Software Watchdog Device
  *
- *  (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *  (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                      All Rights Reserved.
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 86d42801de45..f7f6ce82a5e2 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -6,7 +6,7 @@
  * S3C2410 Watchdog Timer Support
  *
  * Based on, softdog.c by Alan Cox,
- *     (c) Copyright 1996 Alan Cox <alan@redhat.com>
+ *     (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 31a48437dc3d..ed01e4c2beff 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -2,7 +2,7 @@
  *      Watchdog driver for the SA11x0/PXA2xx
  *
  *      (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
- *          Based on SoftDog driver by Alan Cox <alan@redhat.com>
+ *          Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index 27e526a07c9a..38f5831c9291 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -35,8 +35,8 @@
  * Based on various other watchdog drivers, which are probably all
  * loosely based on something Alan Cox wrote years ago.
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c
index fd83dd052d8c..ae74f6bcfa23 100644
--- a/drivers/watchdog/sbc8360.c
+++ b/drivers/watchdog/sbc8360.c
@@ -16,8 +16,8 @@
  *      Based on acquirewdt.c which is based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -28,7 +28,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *           Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index e5e470ca7759..06553debc7bc 100644
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -10,7 +10,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  *
- *      based on softdog.c by Alan Cox <alan@redhat.com>
+ *      based on softdog.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
  */
 
 #include <linux/module.h>
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index 988ff1d5b4be..2e56cad77d19 100644
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -1,7 +1,7 @@
 /*
  *      SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
  *
- *      Based on acquirewdt.c by Alan Cox <alan@redhat.com>
+ *      Based on acquirewdt.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
  *       and some other existing drivers
  *
  *      This program is free software; you can redistribute it and/or
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index c650464c5c63..7204f9662114 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -1,8 +1,7 @@
 /*
  *      SoftDog 0.07:   A Software Watchdog Device
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 69396adaa5c3..916890abffdd 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -11,8 +11,8 @@
  *
  *      (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  */
 
 #include <linux/module.h>
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index 445d30a01ed3..3c7aa412b1f3 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -12,8 +12,8 @@
  *
  *      (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 68377ae171ff..42e940c23891 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -10,8 +10,8 @@
  *      Based on advantechwdt.c which is based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index deeebb2b13ea..eddb9187e7b6 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -1,8 +1,8 @@
 /*
  *      Industrial Computer Source WDT500/501 driver
  *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index 191ea6302107..f55135662d78 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -6,7 +6,8 @@
  *
  *      SoftDog 0.05:   A Software Watchdog Device
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index ed02bdb38c09..c45839a4a34d 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -1,8 +1,8 @@
 /*
  *      Industrial Computer Source PCI-WDT500/501 driver
  *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                               All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 9ce1ab6c268d..1e3b934a4cf7 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -774,7 +774,7 @@ void xen_poll_irq(int irq)
 
                 poll.nr_ports = 1;
                 poll.timeout = 0;
-                poll.ports = &evtchn;
+                set_xen_guest_handle(poll.ports, &evtchn);
 
                 if (HYPERVISOR_sched_op(SCHEDOP_poll, &poll) != 0)
                         BUG();
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index d0e87cbe157c..9b91617b9582 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -39,8 +39,6 @@ static int xen_suspend(void *data)
 
         BUG_ON(!irqs_disabled());
 
-        load_cr3(swapper_pg_dir);
-
         err = device_power_down(PMSG_SUSPEND);
         if (err) {
                 printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n",
diff --git a/drivers/xen/xencomm.c b/drivers/xen/xencomm.c
index 797cb4e31f07..a240b2c20b99 100644
--- a/drivers/xen/xencomm.c
+++ b/drivers/xen/xencomm.c
@@ -23,13 +23,7 @@
 #include <asm/page.h>
 #include <xen/xencomm.h>
 #include <xen/interface/xen.h>
-#ifdef __ia64__
-#include <asm/xen/xencomm.h>    /* for is_kern_addr() */
-#endif
-
-#ifdef HAVE_XEN_PLATFORM_COMPAT_H
-#include <xen/platform-compat.h>
-#endif
+#include <asm/xen/xencomm.h>    /* for xencomm_is_phys_contiguous() */
 
 static int xencomm_init(struct xencomm_desc *desc,
                         void *buffer, unsigned long bytes)
@@ -157,20 +151,11 @@ static int xencomm_create(void *buffer, unsigned long bytes,
         return 0;
 }
 
-/* check if memory address is within VMALLOC region  */
-static int is_phys_contiguous(unsigned long addr)
-{
-        if (!is_kernel_addr(addr))
-                return 0;
-
-        return (addr < VMALLOC_START) || (addr >= VMALLOC_END);
-}
-
 static struct xencomm_handle *xencomm_create_inline(void *ptr)
 {
         unsigned long paddr;
 
-        BUG_ON(!is_phys_contiguous((unsigned long)ptr));
+        BUG_ON(!xencomm_is_phys_contiguous((unsigned long)ptr));
 
         paddr = (unsigned long)xencomm_pa(ptr);
         BUG_ON(paddr & XENCOMM_INLINE_FLAG);
@@ -202,7 +187,7 @@ struct xencomm_handle *xencomm_map(void *ptr, unsigned long bytes)
         int rc;
         struct xencomm_desc *desc;
 
-        if (is_phys_contiguous((unsigned long)ptr))
+        if (xencomm_is_phys_contiguous((unsigned long)ptr))
                 return xencomm_create_inline(ptr);
 
         rc = xencomm_create(ptr, bytes, &desc, GFP_KERNEL);
@@ -219,7 +204,7 @@ struct xencomm_handle *__xencomm_map_no_alloc(void *ptr, unsigned long bytes,
         int rc;
         struct xencomm_desc *desc = NULL;
 
-        if (is_phys_contiguous((unsigned long)ptr))
+        if (xencomm_is_phys_contiguous((unsigned long)ptr))
                 return xencomm_create_inline(ptr);
 
         rc = xencomm_create_mini(ptr, bytes, xc_desc,