Merge branch 'upstream-fixes' into upstream

diff --combined MAINTAINERS
index dbb9d90,32aa30d..fb20abd
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -968,6 -968,10 +968,10 @@@ P:       Andrey V. Savochki
  M:    saw@saw.sw.com.sg
  S:    Maintained
  
+ EFS FILESYSTEM
+ W:    http://aeschi.ch.eu.org/efs/
+ S:    Orphan
+ 
  EMU10K1 SOUND DRIVER
  P:    James Courtier-Dutton
  M:    James@superbug.demon.co.uk
@@@ -1598,7 -1602,7 +1602,7 @@@ W:      http://jfs.sourceforge.net
  T:    git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
  S:    Supported
  
- JOURNALLING LAYER FOR BLOCK DEVICS (JBD)
+ JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
  P:    Stephen Tweedie, Andrew Morton
  M:    sct@redhat.com, akpm@osdl.org
  L:    ext2-devel@lists.sourceforge.net
@@@ -1642,9 -1646,8 +1646,8 @@@ S:      Maintaine
  
  KERNEL JANITORS
  P:    Several
- L:    kernel-janitors@osdl.org
+ L:    kernel-janitors@lists.osdl.org
  W:    http://www.kerneljanitors.org/
- W:    http://sf.net/projects/kernel-janitor/
  S:    Maintained
  
  KERNEL NFSD
@@@ -1882,6 -1885,12 +1885,12 @@@ S:     linux-scsi@vger.kernel.or
  W:     http://megaraid.lsilogic.com
  S:     Maintained
  
+ MEMORY MANAGEMENT
+ L:    linux-mm@kvack.org
+ L:    linux-kernel@vger.kernel.org
+ W:    http://www.linux-mm.org
+ S:    Maintained
+ 
  MEMORY TECHNOLOGY DEVICES (MTD)
  P:    David Woodhouse
  M:    dwmw2@infradead.org
@@@ -2338,12 -2347,6 +2347,12 @@@ M:    linux-driver@qlogic.co
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  
 +QLOGIC QLA3XXX NETWORK DRIVER
 +P:    Ron Mercer
 +M:    linux-driver@qlogic.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +
  QNX4 FILESYSTEM
  P:    Anders Larsen
  M:    al@alarsen.net
@@@ -2594,18 -2597,6 +2603,18 @@@ P:    Nicolas Pitr
  M:    nico@cam.org
  S:    Maintained
  
 +SOFTMAC LAYER (IEEE 802.11)
 +P:    Johannes Berg
 +M:    johannes@sipsolutions.net
 +P:    Joe Jezak
 +M:    josejx@gentoo.org
 +P:    Daniel Drake
 +M:    dsd@gentoo.org
 +W:    http://softmac.sipsolutions.net/
 +L:    softmac-dev@sipsolutions.net
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +
  SOFTWARE RAID (Multiple Disks) SUPPORT
  P:    Ingo Molnar
  M:    mingo@redhat.com
@@@ -3314,15 -3305,6 +3323,15 @@@ W:    http://www.qsl.net/dl1bke
  L:    linux-hams@vger.kernel.org
  S:    Maintained
  
 +ZD1211RW WIRELESS DRIVER
 +P:    Daniel Drake
 +M:    dsd@gentoo.org
 +P:    Ulrich Kunitz
 +M:    kune@deine-taler.de
 +W:    http://zd1211.ath.cx/wiki/DriverRewrite
 +L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
 +S:    Maintained
 +
  ZF MACHZ WATCHDOG
  P:    Fernando Fuganti
  M:    fuganti@netbank.com.br

diff --combined drivers/net/wireless/zd1211rw/zd_usb.c
index c68b9f8,6320984..96551da
--- 1/drivers/net/wireless/zd1211rw/zd_usb.c
--- 2/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@@ -39,11 -39,9 +39,11 @@@ static struct usb_device_id usb_ids[] 
        { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
        { USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 },
        { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
 +      { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 },
        /* ZD1211B */
        { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
        { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
 +      { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },
        {}
  };
  
@@@ -325,7 -323,6 +325,6 @@@ static void disable_read_regs_int(struc
  {
        struct zd_usb_interrupt *intr = &usb->intr;
  
-       ZD_ASSERT(in_interrupt());
        spin_lock(&intr->lock);
        intr->read_regs_enabled = 0;
        spin_unlock(&intr->lock);
@@@ -547,11 -544,11 +546,11 @@@ static void handle_rx_packet(struct zd_
         * be padded. Unaligned access might also happen if the length_info
         * structure is not present.
         */
-       if (get_unaligned(&length_info->tag) == RX_LENGTH_INFO_TAG) {
+       if (get_unaligned(&length_info->tag) == cpu_to_le16(RX_LENGTH_INFO_TAG))
+       {
                unsigned int l, k, n;
                for (i = 0, l = 0;; i++) {
-                       k = le16_to_cpu(get_unaligned(
-                               &length_info->length[i]));
+                       k = le16_to_cpu(get_unaligned(&length_info->length[i]));
                        n = l+k;
                        if (n > length)
                                return;